From 7e4e2ebb0e94370ba06083ad66844556bb6e683d Mon Sep 17 00:00:00 2001
From: Paul Yang <github@ardorful.com>
Date: Sat, 9 Nov 2024 15:57:33 -0800
Subject: [PATCH] Update snapshots.

---
 .../SqlQueryPlan/BigQuery/test_conversion_metric__plan0.sql      | 1 +
 .../BigQuery/test_conversion_metric__plan0_optimized.sql         | 1 +
 .../test_conversion_metric_with_categorical_filter__plan0.sql    | 1 +
 ...onversion_metric_with_categorical_filter__plan0_optimized.sql | 1 +
 ...ersion_metric_with_different_time_dimension_grains__plan0.sql | 1 +
 ...ric_with_different_time_dimension_grains__plan0_optimized.sql | 1 +
 .../BigQuery/test_conversion_metric_with_filter__plan0.sql       | 1 +
 .../test_conversion_metric_with_filter__plan0_optimized.sql      | 1 +
 ...test_conversion_metric_with_filter_not_in_group_by__plan0.sql | 1 +
 ...rsion_metric_with_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_conversion_metric_with_time_constraint__plan0.sql       | 1 +
 ...t_conversion_metric_with_time_constraint__plan0_optimized.sql | 1 +
 .../BigQuery/test_conversion_metric_with_window__plan0.sql       | 1 +
 .../test_conversion_metric_with_window__plan0_optimized.sql      | 1 +
 ..._conversion_metric_with_window_and_time_constraint__plan0.sql | 1 +
 ...n_metric_with_window_and_time_constraint__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Databricks/test_conversion_metric__plan0.sql    | 1 +
 .../Databricks/test_conversion_metric__plan0_optimized.sql       | 1 +
 .../test_conversion_metric_with_categorical_filter__plan0.sql    | 1 +
 ...onversion_metric_with_categorical_filter__plan0_optimized.sql | 1 +
 ...ersion_metric_with_different_time_dimension_grains__plan0.sql | 1 +
 ...ric_with_different_time_dimension_grains__plan0_optimized.sql | 1 +
 .../Databricks/test_conversion_metric_with_filter__plan0.sql     | 1 +
 .../test_conversion_metric_with_filter__plan0_optimized.sql      | 1 +
 ...test_conversion_metric_with_filter_not_in_group_by__plan0.sql | 1 +
 ...rsion_metric_with_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_conversion_metric_with_time_constraint__plan0.sql       | 1 +
 ...t_conversion_metric_with_time_constraint__plan0_optimized.sql | 1 +
 .../Databricks/test_conversion_metric_with_window__plan0.sql     | 1 +
 .../test_conversion_metric_with_window__plan0_optimized.sql      | 1 +
 ..._conversion_metric_with_window_and_time_constraint__plan0.sql | 1 +
 ...n_metric_with_window_and_time_constraint__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/DuckDB/test_conversion_metric__plan0.sql        | 1 +
 .../DuckDB/test_conversion_metric__plan0_optimized.sql           | 1 +
 .../test_conversion_metric_with_categorical_filter__plan0.sql    | 1 +
 ...onversion_metric_with_categorical_filter__plan0_optimized.sql | 1 +
 ...ersion_metric_with_different_time_dimension_grains__plan0.sql | 1 +
 ...ric_with_different_time_dimension_grains__plan0_optimized.sql | 1 +
 .../DuckDB/test_conversion_metric_with_filter__plan0.sql         | 1 +
 .../test_conversion_metric_with_filter__plan0_optimized.sql      | 1 +
 ...test_conversion_metric_with_filter_not_in_group_by__plan0.sql | 1 +
 ...rsion_metric_with_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_conversion_metric_with_time_constraint__plan0.sql       | 1 +
 ...t_conversion_metric_with_time_constraint__plan0_optimized.sql | 1 +
 .../DuckDB/test_conversion_metric_with_window__plan0.sql         | 1 +
 .../test_conversion_metric_with_window__plan0_optimized.sql      | 1 +
 ..._conversion_metric_with_window_and_time_constraint__plan0.sql | 1 +
 ...n_metric_with_window_and_time_constraint__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Postgres/test_conversion_metric__plan0.sql      | 1 +
 .../Postgres/test_conversion_metric__plan0_optimized.sql         | 1 +
 .../test_conversion_metric_with_categorical_filter__plan0.sql    | 1 +
 ...onversion_metric_with_categorical_filter__plan0_optimized.sql | 1 +
 ...ersion_metric_with_different_time_dimension_grains__plan0.sql | 1 +
 ...ric_with_different_time_dimension_grains__plan0_optimized.sql | 1 +
 .../Postgres/test_conversion_metric_with_filter__plan0.sql       | 1 +
 .../test_conversion_metric_with_filter__plan0_optimized.sql      | 1 +
 ...test_conversion_metric_with_filter_not_in_group_by__plan0.sql | 1 +
 ...rsion_metric_with_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_conversion_metric_with_time_constraint__plan0.sql       | 1 +
 ...t_conversion_metric_with_time_constraint__plan0_optimized.sql | 1 +
 .../Postgres/test_conversion_metric_with_window__plan0.sql       | 1 +
 .../test_conversion_metric_with_window__plan0_optimized.sql      | 1 +
 ..._conversion_metric_with_window_and_time_constraint__plan0.sql | 1 +
 ...n_metric_with_window_and_time_constraint__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Redshift/test_conversion_metric__plan0.sql      | 1 +
 .../Redshift/test_conversion_metric__plan0_optimized.sql         | 1 +
 .../test_conversion_metric_with_categorical_filter__plan0.sql    | 1 +
 ...onversion_metric_with_categorical_filter__plan0_optimized.sql | 1 +
 ...ersion_metric_with_different_time_dimension_grains__plan0.sql | 1 +
 ...ric_with_different_time_dimension_grains__plan0_optimized.sql | 1 +
 .../Redshift/test_conversion_metric_with_filter__plan0.sql       | 1 +
 .../test_conversion_metric_with_filter__plan0_optimized.sql      | 1 +
 ...test_conversion_metric_with_filter_not_in_group_by__plan0.sql | 1 +
 ...rsion_metric_with_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_conversion_metric_with_time_constraint__plan0.sql       | 1 +
 ...t_conversion_metric_with_time_constraint__plan0_optimized.sql | 1 +
 .../Redshift/test_conversion_metric_with_window__plan0.sql       | 1 +
 .../test_conversion_metric_with_window__plan0_optimized.sql      | 1 +
 ..._conversion_metric_with_window_and_time_constraint__plan0.sql | 1 +
 ...n_metric_with_window_and_time_constraint__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Snowflake/test_conversion_metric__plan0.sql     | 1 +
 .../Snowflake/test_conversion_metric__plan0_optimized.sql        | 1 +
 .../test_conversion_metric_with_categorical_filter__plan0.sql    | 1 +
 ...onversion_metric_with_categorical_filter__plan0_optimized.sql | 1 +
 ...ersion_metric_with_different_time_dimension_grains__plan0.sql | 1 +
 ...ric_with_different_time_dimension_grains__plan0_optimized.sql | 1 +
 .../Snowflake/test_conversion_metric_with_filter__plan0.sql      | 1 +
 .../test_conversion_metric_with_filter__plan0_optimized.sql      | 1 +
 ...test_conversion_metric_with_filter_not_in_group_by__plan0.sql | 1 +
 ...rsion_metric_with_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_conversion_metric_with_time_constraint__plan0.sql       | 1 +
 ...t_conversion_metric_with_time_constraint__plan0_optimized.sql | 1 +
 .../Snowflake/test_conversion_metric_with_window__plan0.sql      | 1 +
 .../test_conversion_metric_with_window__plan0_optimized.sql      | 1 +
 ..._conversion_metric_with_window_and_time_constraint__plan0.sql | 1 +
 ...n_metric_with_window_and_time_constraint__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_conversion_metric__plan0.sql         | 1 +
 .../Trino/test_conversion_metric__plan0_optimized.sql            | 1 +
 .../test_conversion_metric_with_categorical_filter__plan0.sql    | 1 +
 ...onversion_metric_with_categorical_filter__plan0_optimized.sql | 1 +
 ...ersion_metric_with_different_time_dimension_grains__plan0.sql | 1 +
 ...ric_with_different_time_dimension_grains__plan0_optimized.sql | 1 +
 .../Trino/test_conversion_metric_with_filter__plan0.sql          | 1 +
 .../test_conversion_metric_with_filter__plan0_optimized.sql      | 1 +
 ...test_conversion_metric_with_filter_not_in_group_by__plan0.sql | 1 +
 ...rsion_metric_with_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../Trino/test_conversion_metric_with_time_constraint__plan0.sql | 1 +
 ...t_conversion_metric_with_time_constraint__plan0_optimized.sql | 1 +
 .../Trino/test_conversion_metric_with_window__plan0.sql          | 1 +
 .../test_conversion_metric_with_window__plan0_optimized.sql      | 1 +
 ..._conversion_metric_with_window_and_time_constraint__plan0.sql | 1 +
 ...n_metric_with_window_and_time_constraint__plan0_optimized.sql | 1 +
 .../BigQuery/test_conversion_count_with_no_group_by__plan0.sql   | 1 +
 .../test_conversion_count_with_no_group_by__plan0_optimized.sql  | 1 +
 ...ion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql | 1 +
 ..._join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/BigQuery/test_conversion_rate__plan0.sql        | 1 +
 .../BigQuery/test_conversion_rate__plan0_optimized.sql           | 1 +
 .../test_conversion_rate_with_constant_properties__plan0.sql     | 1 +
 ...conversion_rate_with_constant_properties__plan0_optimized.sql | 1 +
 .../BigQuery/test_conversion_rate_with_no_group_by__plan0.sql    | 1 +
 .../test_conversion_rate_with_no_group_by__plan0_optimized.sql   | 1 +
 .../BigQuery/test_conversion_rate_with_window__plan0.sql         | 1 +
 .../test_conversion_rate_with_window__plan0_optimized.sql        | 1 +
 .../Databricks/test_conversion_count_with_no_group_by__plan0.sql | 1 +
 .../test_conversion_count_with_no_group_by__plan0_optimized.sql  | 1 +
 ...ion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql | 1 +
 ..._join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Databricks/test_conversion_rate__plan0.sql      | 1 +
 .../Databricks/test_conversion_rate__plan0_optimized.sql         | 1 +
 .../test_conversion_rate_with_constant_properties__plan0.sql     | 1 +
 ...conversion_rate_with_constant_properties__plan0_optimized.sql | 1 +
 .../Databricks/test_conversion_rate_with_no_group_by__plan0.sql  | 1 +
 .../test_conversion_rate_with_no_group_by__plan0_optimized.sql   | 1 +
 .../Databricks/test_conversion_rate_with_window__plan0.sql       | 1 +
 .../test_conversion_rate_with_window__plan0_optimized.sql        | 1 +
 .../DuckDB/test_conversion_count_with_no_group_by__plan0.sql     | 1 +
 .../test_conversion_count_with_no_group_by__plan0_optimized.sql  | 1 +
 ...ion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql | 1 +
 ..._join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/DuckDB/test_conversion_rate__plan0.sql          | 1 +
 .../DuckDB/test_conversion_rate__plan0_optimized.sql             | 1 +
 .../test_conversion_rate_with_constant_properties__plan0.sql     | 1 +
 ...conversion_rate_with_constant_properties__plan0_optimized.sql | 1 +
 .../DuckDB/test_conversion_rate_with_no_group_by__plan0.sql      | 1 +
 .../test_conversion_rate_with_no_group_by__plan0_optimized.sql   | 1 +
 .../DuckDB/test_conversion_rate_with_window__plan0.sql           | 1 +
 .../DuckDB/test_conversion_rate_with_window__plan0_optimized.sql | 1 +
 .../Postgres/test_conversion_count_with_no_group_by__plan0.sql   | 1 +
 .../test_conversion_count_with_no_group_by__plan0_optimized.sql  | 1 +
 ...ion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql | 1 +
 ..._join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Postgres/test_conversion_rate__plan0.sql        | 1 +
 .../Postgres/test_conversion_rate__plan0_optimized.sql           | 1 +
 .../test_conversion_rate_with_constant_properties__plan0.sql     | 1 +
 ...conversion_rate_with_constant_properties__plan0_optimized.sql | 1 +
 .../Postgres/test_conversion_rate_with_no_group_by__plan0.sql    | 1 +
 .../test_conversion_rate_with_no_group_by__plan0_optimized.sql   | 1 +
 .../Postgres/test_conversion_rate_with_window__plan0.sql         | 1 +
 .../test_conversion_rate_with_window__plan0_optimized.sql        | 1 +
 .../Redshift/test_conversion_count_with_no_group_by__plan0.sql   | 1 +
 .../test_conversion_count_with_no_group_by__plan0_optimized.sql  | 1 +
 ...ion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql | 1 +
 ..._join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Redshift/test_conversion_rate__plan0.sql        | 1 +
 .../Redshift/test_conversion_rate__plan0_optimized.sql           | 1 +
 .../test_conversion_rate_with_constant_properties__plan0.sql     | 1 +
 ...conversion_rate_with_constant_properties__plan0_optimized.sql | 1 +
 .../Redshift/test_conversion_rate_with_no_group_by__plan0.sql    | 1 +
 .../test_conversion_rate_with_no_group_by__plan0_optimized.sql   | 1 +
 .../Redshift/test_conversion_rate_with_window__plan0.sql         | 1 +
 .../test_conversion_rate_with_window__plan0_optimized.sql        | 1 +
 .../Snowflake/test_conversion_count_with_no_group_by__plan0.sql  | 1 +
 .../test_conversion_count_with_no_group_by__plan0_optimized.sql  | 1 +
 ...ion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql | 1 +
 ..._join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Snowflake/test_conversion_rate__plan0.sql       | 1 +
 .../Snowflake/test_conversion_rate__plan0_optimized.sql          | 1 +
 .../test_conversion_rate_with_constant_properties__plan0.sql     | 1 +
 ...conversion_rate_with_constant_properties__plan0_optimized.sql | 1 +
 .../Snowflake/test_conversion_rate_with_no_group_by__plan0.sql   | 1 +
 .../test_conversion_rate_with_no_group_by__plan0_optimized.sql   | 1 +
 .../Snowflake/test_conversion_rate_with_window__plan0.sql        | 1 +
 .../test_conversion_rate_with_window__plan0_optimized.sql        | 1 +
 .../Trino/test_conversion_count_with_no_group_by__plan0.sql      | 1 +
 .../test_conversion_count_with_no_group_by__plan0_optimized.sql  | 1 +
 ...ion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql | 1 +
 ..._join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_conversion_rate__plan0.sql           | 1 +
 .../SqlQueryPlan/Trino/test_conversion_rate__plan0_optimized.sql | 1 +
 .../test_conversion_rate_with_constant_properties__plan0.sql     | 1 +
 ...conversion_rate_with_constant_properties__plan0_optimized.sql | 1 +
 .../Trino/test_conversion_rate_with_no_group_by__plan0.sql       | 1 +
 .../test_conversion_rate_with_no_group_by__plan0_optimized.sql   | 1 +
 .../Trino/test_conversion_rate_with_window__plan0.sql            | 1 +
 .../Trino/test_conversion_rate_with_window__plan0_optimized.sql  | 1 +
 .../BigQuery/test_convert_query_semantic_model__plan0.sql        | 1 +
 .../test_convert_table_semantic_model_with_measures__plan0.sql   | 1 +
 ...test_convert_table_semantic_model_without_measures__plan0.sql | 1 +
 .../Databricks/test_convert_query_semantic_model__plan0.sql      | 1 +
 .../test_convert_table_semantic_model_with_measures__plan0.sql   | 1 +
 ...test_convert_table_semantic_model_without_measures__plan0.sql | 1 +
 .../DuckDB/test_convert_query_semantic_model__plan0.sql          | 1 +
 .../test_convert_table_semantic_model_with_measures__plan0.sql   | 1 +
 ...test_convert_table_semantic_model_without_measures__plan0.sql | 1 +
 .../Postgres/test_convert_query_semantic_model__plan0.sql        | 1 +
 .../test_convert_table_semantic_model_with_measures__plan0.sql   | 1 +
 ...test_convert_table_semantic_model_without_measures__plan0.sql | 1 +
 .../Redshift/test_convert_query_semantic_model__plan0.sql        | 1 +
 .../test_convert_table_semantic_model_with_measures__plan0.sql   | 1 +
 ...test_convert_table_semantic_model_without_measures__plan0.sql | 1 +
 .../Snowflake/test_convert_query_semantic_model__plan0.sql       | 1 +
 .../test_convert_table_semantic_model_with_measures__plan0.sql   | 1 +
 ...test_convert_table_semantic_model_without_measures__plan0.sql | 1 +
 .../Trino/test_convert_query_semantic_model__plan0.sql           | 1 +
 .../test_convert_table_semantic_model_with_measures__plan0.sql   | 1 +
 ...test_convert_table_semantic_model_without_measures__plan0.sql | 1 +
 .../test_all_time_metric_with_non_default_grains__plan0.sql      | 1 +
 ..._all_time_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql      | 1 +
 .../BigQuery/test_cumulative_metric__plan0_optimized.sql         | 1 +
 .../BigQuery/test_cumulative_metric_grain_to_date__plan0.sql     | 1 +
 .../test_cumulative_metric_grain_to_date__plan0_optimized.sql    | 1 +
 .../BigQuery/test_cumulative_metric_no_ds__plan0.sql             | 1 +
 .../BigQuery/test_cumulative_metric_no_ds__plan0_optimized.sql   | 1 +
 .../BigQuery/test_cumulative_metric_no_window__plan0.sql         | 1 +
 .../test_cumulative_metric_no_window__plan0_optimized.sql        | 1 +
 ...t_cumulative_metric_no_window_with_time_constraint__plan0.sql | 1 +
 ...ve_metric_no_window_with_time_constraint__plan0_optimized.sql | 1 +
 ...st_cumulative_metric_with_agg_time_and_metric_time__plan0.sql | 1 +
 ...ive_metric_with_agg_time_and_metric_time__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_agg_time_dimension__plan0.sql    | 1 +
 ...umulative_metric_with_agg_time_dimension__plan0_optimized.sql | 1 +
 ...umulative_metric_with_multiple_agg_time_dimensions__plan0.sql | 1 +
 ...metric_with_multiple_agg_time_dimensions__plan0_optimized.sql | 1 +
 ...lative_metric_with_multiple_metric_time_dimensions__plan0.sql | 1 +
 ...ric_with_multiple_metric_time_dimensions__plan0_optimized.sql | 1 +
 ..._cumulative_metric_with_non_adjustable_time_filter__plan0.sql | 1 +
 ...e_metric_with_non_adjustable_time_filter__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_non_default_grain__plan0.sql     | 1 +
 ...cumulative_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_time_constraint__plan0.sql       | 1 +
 ...t_cumulative_metric_with_time_constraint__plan0_optimized.sql | 1 +
 ..._derived_cumulative_metric_with_non_default_grains__plan0.sql | 1 +
 ...umulative_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_grain_to_date_metric_with_non_default_grain__plan0.sql  | 1 +
 ...in_to_date_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_grain_to_date_metric_with_non_default_grains__plan0.sql | 1 +
 ...n_to_date_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_window_metric_with_non_default_grain__plan0.sql         | 1 +
 ...est_window_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_window_metric_with_non_default_grains__plan0.sql        | 1 +
 ...st_window_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_all_time_metric_with_non_default_grains__plan0.sql      | 1 +
 ..._all_time_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql    | 1 +
 .../Databricks/test_cumulative_metric__plan0_optimized.sql       | 1 +
 .../Databricks/test_cumulative_metric_grain_to_date__plan0.sql   | 1 +
 .../test_cumulative_metric_grain_to_date__plan0_optimized.sql    | 1 +
 .../Databricks/test_cumulative_metric_no_ds__plan0.sql           | 1 +
 .../Databricks/test_cumulative_metric_no_ds__plan0_optimized.sql | 1 +
 .../Databricks/test_cumulative_metric_no_window__plan0.sql       | 1 +
 .../test_cumulative_metric_no_window__plan0_optimized.sql        | 1 +
 ...t_cumulative_metric_no_window_with_time_constraint__plan0.sql | 1 +
 ...ve_metric_no_window_with_time_constraint__plan0_optimized.sql | 1 +
 ...st_cumulative_metric_with_agg_time_and_metric_time__plan0.sql | 1 +
 ...ive_metric_with_agg_time_and_metric_time__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_agg_time_dimension__plan0.sql    | 1 +
 ...umulative_metric_with_agg_time_dimension__plan0_optimized.sql | 1 +
 ...umulative_metric_with_multiple_agg_time_dimensions__plan0.sql | 1 +
 ...metric_with_multiple_agg_time_dimensions__plan0_optimized.sql | 1 +
 ...lative_metric_with_multiple_metric_time_dimensions__plan0.sql | 1 +
 ...ric_with_multiple_metric_time_dimensions__plan0_optimized.sql | 1 +
 ..._cumulative_metric_with_non_adjustable_time_filter__plan0.sql | 1 +
 ...e_metric_with_non_adjustable_time_filter__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_non_default_grain__plan0.sql     | 1 +
 ...cumulative_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_time_constraint__plan0.sql       | 1 +
 ...t_cumulative_metric_with_time_constraint__plan0_optimized.sql | 1 +
 ..._derived_cumulative_metric_with_non_default_grains__plan0.sql | 1 +
 ...umulative_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_grain_to_date_metric_with_non_default_grain__plan0.sql  | 1 +
 ...in_to_date_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_grain_to_date_metric_with_non_default_grains__plan0.sql | 1 +
 ...n_to_date_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_window_metric_with_non_default_grain__plan0.sql         | 1 +
 ...est_window_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_window_metric_with_non_default_grains__plan0.sql        | 1 +
 ...st_window_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_all_time_metric_with_non_default_grains__plan0.sql      | 1 +
 ..._all_time_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql        | 1 +
 .../DuckDB/test_cumulative_metric__plan0_optimized.sql           | 1 +
 .../DuckDB/test_cumulative_metric_grain_to_date__plan0.sql       | 1 +
 .../test_cumulative_metric_grain_to_date__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql  | 1 +
 .../DuckDB/test_cumulative_metric_no_ds__plan0_optimized.sql     | 1 +
 .../DuckDB/test_cumulative_metric_no_window__plan0.sql           | 1 +
 .../DuckDB/test_cumulative_metric_no_window__plan0_optimized.sql | 1 +
 ...t_cumulative_metric_no_window_with_time_constraint__plan0.sql | 1 +
 ...ve_metric_no_window_with_time_constraint__plan0_optimized.sql | 1 +
 ...st_cumulative_metric_with_agg_time_and_metric_time__plan0.sql | 1 +
 ...ive_metric_with_agg_time_and_metric_time__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_agg_time_dimension__plan0.sql    | 1 +
 ...umulative_metric_with_agg_time_dimension__plan0_optimized.sql | 1 +
 ...umulative_metric_with_multiple_agg_time_dimensions__plan0.sql | 1 +
 ...metric_with_multiple_agg_time_dimensions__plan0_optimized.sql | 1 +
 ...lative_metric_with_multiple_metric_time_dimensions__plan0.sql | 1 +
 ...ric_with_multiple_metric_time_dimensions__plan0_optimized.sql | 1 +
 ..._cumulative_metric_with_non_adjustable_time_filter__plan0.sql | 1 +
 ...e_metric_with_non_adjustable_time_filter__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_non_default_grain__plan0.sql     | 1 +
 ...cumulative_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_time_constraint__plan0.sql       | 1 +
 ...t_cumulative_metric_with_time_constraint__plan0_optimized.sql | 1 +
 ..._derived_cumulative_metric_with_non_default_grains__plan0.sql | 1 +
 ...umulative_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_grain_to_date_metric_with_non_default_grain__plan0.sql  | 1 +
 ...in_to_date_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_grain_to_date_metric_with_non_default_grains__plan0.sql | 1 +
 ...n_to_date_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../DuckDB/test_window_metric_with_non_default_grain__plan0.sql  | 1 +
 ...est_window_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../DuckDB/test_window_metric_with_non_default_grains__plan0.sql | 1 +
 ...st_window_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_all_time_metric_with_non_default_grains__plan0.sql      | 1 +
 ..._all_time_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql      | 1 +
 .../Postgres/test_cumulative_metric__plan0_optimized.sql         | 1 +
 .../Postgres/test_cumulative_metric_grain_to_date__plan0.sql     | 1 +
 .../test_cumulative_metric_grain_to_date__plan0_optimized.sql    | 1 +
 .../Postgres/test_cumulative_metric_no_ds__plan0.sql             | 1 +
 .../Postgres/test_cumulative_metric_no_ds__plan0_optimized.sql   | 1 +
 .../Postgres/test_cumulative_metric_no_window__plan0.sql         | 1 +
 .../test_cumulative_metric_no_window__plan0_optimized.sql        | 1 +
 ...t_cumulative_metric_no_window_with_time_constraint__plan0.sql | 1 +
 ...ve_metric_no_window_with_time_constraint__plan0_optimized.sql | 1 +
 ...st_cumulative_metric_with_agg_time_and_metric_time__plan0.sql | 1 +
 ...ive_metric_with_agg_time_and_metric_time__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_agg_time_dimension__plan0.sql    | 1 +
 ...umulative_metric_with_agg_time_dimension__plan0_optimized.sql | 1 +
 ...umulative_metric_with_multiple_agg_time_dimensions__plan0.sql | 1 +
 ...metric_with_multiple_agg_time_dimensions__plan0_optimized.sql | 1 +
 ...lative_metric_with_multiple_metric_time_dimensions__plan0.sql | 1 +
 ...ric_with_multiple_metric_time_dimensions__plan0_optimized.sql | 1 +
 ..._cumulative_metric_with_non_adjustable_time_filter__plan0.sql | 1 +
 ...e_metric_with_non_adjustable_time_filter__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_non_default_grain__plan0.sql     | 1 +
 ...cumulative_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_time_constraint__plan0.sql       | 1 +
 ...t_cumulative_metric_with_time_constraint__plan0_optimized.sql | 1 +
 ..._derived_cumulative_metric_with_non_default_grains__plan0.sql | 1 +
 ...umulative_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_grain_to_date_metric_with_non_default_grain__plan0.sql  | 1 +
 ...in_to_date_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_grain_to_date_metric_with_non_default_grains__plan0.sql | 1 +
 ...n_to_date_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_window_metric_with_non_default_grain__plan0.sql         | 1 +
 ...est_window_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_window_metric_with_non_default_grains__plan0.sql        | 1 +
 ...st_window_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_all_time_metric_with_non_default_grains__plan0.sql      | 1 +
 ..._all_time_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql      | 1 +
 .../Redshift/test_cumulative_metric__plan0_optimized.sql         | 1 +
 .../Redshift/test_cumulative_metric_grain_to_date__plan0.sql     | 1 +
 .../test_cumulative_metric_grain_to_date__plan0_optimized.sql    | 1 +
 .../Redshift/test_cumulative_metric_no_ds__plan0.sql             | 1 +
 .../Redshift/test_cumulative_metric_no_ds__plan0_optimized.sql   | 1 +
 .../Redshift/test_cumulative_metric_no_window__plan0.sql         | 1 +
 .../test_cumulative_metric_no_window__plan0_optimized.sql        | 1 +
 ...t_cumulative_metric_no_window_with_time_constraint__plan0.sql | 1 +
 ...ve_metric_no_window_with_time_constraint__plan0_optimized.sql | 1 +
 ...st_cumulative_metric_with_agg_time_and_metric_time__plan0.sql | 1 +
 ...ive_metric_with_agg_time_and_metric_time__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_agg_time_dimension__plan0.sql    | 1 +
 ...umulative_metric_with_agg_time_dimension__plan0_optimized.sql | 1 +
 ...umulative_metric_with_multiple_agg_time_dimensions__plan0.sql | 1 +
 ...metric_with_multiple_agg_time_dimensions__plan0_optimized.sql | 1 +
 ...lative_metric_with_multiple_metric_time_dimensions__plan0.sql | 1 +
 ...ric_with_multiple_metric_time_dimensions__plan0_optimized.sql | 1 +
 ..._cumulative_metric_with_non_adjustable_time_filter__plan0.sql | 1 +
 ...e_metric_with_non_adjustable_time_filter__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_non_default_grain__plan0.sql     | 1 +
 ...cumulative_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_time_constraint__plan0.sql       | 1 +
 ...t_cumulative_metric_with_time_constraint__plan0_optimized.sql | 1 +
 ..._derived_cumulative_metric_with_non_default_grains__plan0.sql | 1 +
 ...umulative_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_grain_to_date_metric_with_non_default_grain__plan0.sql  | 1 +
 ...in_to_date_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_grain_to_date_metric_with_non_default_grains__plan0.sql | 1 +
 ...n_to_date_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_window_metric_with_non_default_grain__plan0.sql         | 1 +
 ...est_window_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_window_metric_with_non_default_grains__plan0.sql        | 1 +
 ...st_window_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_all_time_metric_with_non_default_grains__plan0.sql      | 1 +
 ..._all_time_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql     | 1 +
 .../Snowflake/test_cumulative_metric__plan0_optimized.sql        | 1 +
 .../Snowflake/test_cumulative_metric_grain_to_date__plan0.sql    | 1 +
 .../test_cumulative_metric_grain_to_date__plan0_optimized.sql    | 1 +
 .../Snowflake/test_cumulative_metric_no_ds__plan0.sql            | 1 +
 .../Snowflake/test_cumulative_metric_no_ds__plan0_optimized.sql  | 1 +
 .../Snowflake/test_cumulative_metric_no_window__plan0.sql        | 1 +
 .../test_cumulative_metric_no_window__plan0_optimized.sql        | 1 +
 ...t_cumulative_metric_no_window_with_time_constraint__plan0.sql | 1 +
 ...ve_metric_no_window_with_time_constraint__plan0_optimized.sql | 1 +
 ...st_cumulative_metric_with_agg_time_and_metric_time__plan0.sql | 1 +
 ...ive_metric_with_agg_time_and_metric_time__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_agg_time_dimension__plan0.sql    | 1 +
 ...umulative_metric_with_agg_time_dimension__plan0_optimized.sql | 1 +
 ...umulative_metric_with_multiple_agg_time_dimensions__plan0.sql | 1 +
 ...metric_with_multiple_agg_time_dimensions__plan0_optimized.sql | 1 +
 ...lative_metric_with_multiple_metric_time_dimensions__plan0.sql | 1 +
 ...ric_with_multiple_metric_time_dimensions__plan0_optimized.sql | 1 +
 ..._cumulative_metric_with_non_adjustable_time_filter__plan0.sql | 1 +
 ...e_metric_with_non_adjustable_time_filter__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_non_default_grain__plan0.sql     | 1 +
 ...cumulative_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_time_constraint__plan0.sql       | 1 +
 ...t_cumulative_metric_with_time_constraint__plan0_optimized.sql | 1 +
 ..._derived_cumulative_metric_with_non_default_grains__plan0.sql | 1 +
 ...umulative_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_grain_to_date_metric_with_non_default_grain__plan0.sql  | 1 +
 ...in_to_date_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_grain_to_date_metric_with_non_default_grains__plan0.sql | 1 +
 ...n_to_date_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_window_metric_with_non_default_grain__plan0.sql         | 1 +
 ...est_window_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_window_metric_with_non_default_grains__plan0.sql        | 1 +
 ...st_window_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_all_time_metric_with_non_default_grains__plan0.sql      | 1 +
 ..._all_time_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_cumulative_metric__plan0.sql         | 1 +
 .../Trino/test_cumulative_metric__plan0_optimized.sql            | 1 +
 .../Trino/test_cumulative_metric_grain_to_date__plan0.sql        | 1 +
 .../test_cumulative_metric_grain_to_date__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/Trino/test_cumulative_metric_no_ds__plan0.sql   | 1 +
 .../Trino/test_cumulative_metric_no_ds__plan0_optimized.sql      | 1 +
 .../Trino/test_cumulative_metric_no_window__plan0.sql            | 1 +
 .../Trino/test_cumulative_metric_no_window__plan0_optimized.sql  | 1 +
 ...t_cumulative_metric_no_window_with_time_constraint__plan0.sql | 1 +
 ...ve_metric_no_window_with_time_constraint__plan0_optimized.sql | 1 +
 ...st_cumulative_metric_with_agg_time_and_metric_time__plan0.sql | 1 +
 ...ive_metric_with_agg_time_and_metric_time__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_agg_time_dimension__plan0.sql    | 1 +
 ...umulative_metric_with_agg_time_dimension__plan0_optimized.sql | 1 +
 ...umulative_metric_with_multiple_agg_time_dimensions__plan0.sql | 1 +
 ...metric_with_multiple_agg_time_dimensions__plan0_optimized.sql | 1 +
 ...lative_metric_with_multiple_metric_time_dimensions__plan0.sql | 1 +
 ...ric_with_multiple_metric_time_dimensions__plan0_optimized.sql | 1 +
 ..._cumulative_metric_with_non_adjustable_time_filter__plan0.sql | 1 +
 ...e_metric_with_non_adjustable_time_filter__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_non_default_grain__plan0.sql     | 1 +
 ...cumulative_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../Trino/test_cumulative_metric_with_time_constraint__plan0.sql | 1 +
 ...t_cumulative_metric_with_time_constraint__plan0_optimized.sql | 1 +
 ..._derived_cumulative_metric_with_non_default_grains__plan0.sql | 1 +
 ...umulative_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_grain_to_date_metric_with_non_default_grain__plan0.sql  | 1 +
 ...in_to_date_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../test_grain_to_date_metric_with_non_default_grains__plan0.sql | 1 +
 ...n_to_date_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../Trino/test_window_metric_with_non_default_grain__plan0.sql   | 1 +
 ...est_window_metric_with_non_default_grain__plan0_optimized.sql | 1 +
 .../Trino/test_window_metric_with_non_default_grains__plan0.sql  | 1 +
 ...st_window_metric_with_non_default_grains__plan0_optimized.sql | 1 +
 .../test_conversion_metric_with_custom_granularity__plan0.sql    | 1 +
 ...onversion_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...t_conversion_metric_with_custom_granularity_filter__plan0.sql | 1 +
 ...on_metric_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_filter_not_in_group_by__plan0.sql | 1 +
 ...ustom_granularity_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_custom_granularity__plan0.sql    | 1 +
 ...umulative_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 .../test_derived_metric_with_custom_granularity__plan0.sql       | 1 +
 ...t_derived_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ..._join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql | 1 +
 ...ime_spine_metric_grouped_by_custom_grain__plan0_optimized.sql | 1 +
 ...ric_custom_granularity_joined_to_non_default_grain__plan0.sql | 1 +
 ..._granularity_joined_to_non_default_grain__plan0_optimized.sql | 1 +
 .../test_multiple_metrics_with_custom_granularity__plan0.sql     | 1 +
 ...multiple_metrics_with_custom_granularity__plan0_optimized.sql | 1 +
 ...ric_custom_granularity_joined_to_non_default_grain__plan0.sql | 1 +
 ..._granularity_joined_to_non_default_grain__plan0_optimized.sql | 1 +
 .../test_no_metric_custom_granularity_metric_time__plan0.sql     | 1 +
 ...no_metric_custom_granularity_metric_time__plan0_optimized.sql | 1 +
 .../test_no_metric_custom_granularity_non_metric_time__plan0.sql | 1 +
 ...etric_custom_granularity_non_metric_time__plan0_optimized.sql | 1 +
 .../test_no_metrics_with_custom_granularity_filter__plan0.sql    | 1 +
 ...o_metrics_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ics_with_custom_granularity_in_filter_and_group_by__plan0.sql | 1 +
 ...ustom_granularity_in_filter_and_group_by__plan0_optimized.sql | 1 +
 .../test_offset_metric_with_custom_granularity__plan0.sql        | 1 +
 ...st_offset_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_filter_not_in_group_by__plan0.sql | 1 +
 ...ustom_granularity_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_custom_granularity__plan0.sql        | 1 +
 ...st_simple_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...est_simple_metric_with_custom_granularity_and_join__plan0.sql | 1 +
 ..._metric_with_custom_granularity_and_join__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_custom_granularity_filter__plan0.sql | 1 +
 ...le_metric_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_in_filter_and_group_by__plan0.sql | 1 +
 ...ustom_granularity_in_filter_and_group_by__plan0_optimized.sql | 1 +
 ...st_simple_metric_with_multi_hop_custom_granularity__plan0.sql | 1 +
 ...metric_with_multi_hop_custom_granularity__plan0_optimized.sql | 1 +
 .../test_conversion_metric_with_custom_granularity__plan0.sql    | 1 +
 ...onversion_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...t_conversion_metric_with_custom_granularity_filter__plan0.sql | 1 +
 ...on_metric_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_filter_not_in_group_by__plan0.sql | 1 +
 ...ustom_granularity_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_custom_granularity__plan0.sql    | 1 +
 ...umulative_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 .../test_derived_metric_with_custom_granularity__plan0.sql       | 1 +
 ...t_derived_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ..._join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql | 1 +
 ...ime_spine_metric_grouped_by_custom_grain__plan0_optimized.sql | 1 +
 ...ric_custom_granularity_joined_to_non_default_grain__plan0.sql | 1 +
 ..._granularity_joined_to_non_default_grain__plan0_optimized.sql | 1 +
 .../test_multiple_metrics_with_custom_granularity__plan0.sql     | 1 +
 ...multiple_metrics_with_custom_granularity__plan0_optimized.sql | 1 +
 ...ric_custom_granularity_joined_to_non_default_grain__plan0.sql | 1 +
 ..._granularity_joined_to_non_default_grain__plan0_optimized.sql | 1 +
 .../test_no_metric_custom_granularity_metric_time__plan0.sql     | 1 +
 ...no_metric_custom_granularity_metric_time__plan0_optimized.sql | 1 +
 .../test_no_metric_custom_granularity_non_metric_time__plan0.sql | 1 +
 ...etric_custom_granularity_non_metric_time__plan0_optimized.sql | 1 +
 .../test_no_metrics_with_custom_granularity_filter__plan0.sql    | 1 +
 ...o_metrics_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ics_with_custom_granularity_in_filter_and_group_by__plan0.sql | 1 +
 ...ustom_granularity_in_filter_and_group_by__plan0_optimized.sql | 1 +
 .../test_offset_metric_with_custom_granularity__plan0.sql        | 1 +
 ...st_offset_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_filter_not_in_group_by__plan0.sql | 1 +
 ...ustom_granularity_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_custom_granularity__plan0.sql        | 1 +
 ...st_simple_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...est_simple_metric_with_custom_granularity_and_join__plan0.sql | 1 +
 ..._metric_with_custom_granularity_and_join__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_custom_granularity_filter__plan0.sql | 1 +
 ...le_metric_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_in_filter_and_group_by__plan0.sql | 1 +
 ...ustom_granularity_in_filter_and_group_by__plan0_optimized.sql | 1 +
 ...st_simple_metric_with_multi_hop_custom_granularity__plan0.sql | 1 +
 ...metric_with_multi_hop_custom_granularity__plan0_optimized.sql | 1 +
 .../test_conversion_metric_with_custom_granularity__plan0.sql    | 1 +
 ...onversion_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...t_conversion_metric_with_custom_granularity_filter__plan0.sql | 1 +
 ...on_metric_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_filter_not_in_group_by__plan0.sql | 1 +
 ...ustom_granularity_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_custom_granularity__plan0.sql    | 1 +
 ...umulative_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 .../test_derived_metric_with_custom_granularity__plan0.sql       | 1 +
 ...t_derived_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ..._join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql | 1 +
 ...ime_spine_metric_grouped_by_custom_grain__plan0_optimized.sql | 1 +
 ...ric_custom_granularity_joined_to_non_default_grain__plan0.sql | 1 +
 ..._granularity_joined_to_non_default_grain__plan0_optimized.sql | 1 +
 .../test_multiple_metrics_with_custom_granularity__plan0.sql     | 1 +
 ...multiple_metrics_with_custom_granularity__plan0_optimized.sql | 1 +
 ...ric_custom_granularity_joined_to_non_default_grain__plan0.sql | 1 +
 ..._granularity_joined_to_non_default_grain__plan0_optimized.sql | 1 +
 .../test_no_metric_custom_granularity_metric_time__plan0.sql     | 1 +
 ...no_metric_custom_granularity_metric_time__plan0_optimized.sql | 1 +
 .../test_no_metric_custom_granularity_non_metric_time__plan0.sql | 1 +
 ...etric_custom_granularity_non_metric_time__plan0_optimized.sql | 1 +
 .../test_no_metrics_with_custom_granularity_filter__plan0.sql    | 1 +
 ...o_metrics_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ics_with_custom_granularity_in_filter_and_group_by__plan0.sql | 1 +
 ...ustom_granularity_in_filter_and_group_by__plan0_optimized.sql | 1 +
 .../DuckDB/test_offset_metric_with_custom_granularity__plan0.sql | 1 +
 ...st_offset_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_filter_not_in_group_by__plan0.sql | 1 +
 ...ustom_granularity_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../DuckDB/test_simple_metric_with_custom_granularity__plan0.sql | 1 +
 ...st_simple_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...est_simple_metric_with_custom_granularity_and_join__plan0.sql | 1 +
 ..._metric_with_custom_granularity_and_join__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_custom_granularity_filter__plan0.sql | 1 +
 ...le_metric_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_in_filter_and_group_by__plan0.sql | 1 +
 ...ustom_granularity_in_filter_and_group_by__plan0_optimized.sql | 1 +
 ...st_simple_metric_with_multi_hop_custom_granularity__plan0.sql | 1 +
 ...metric_with_multi_hop_custom_granularity__plan0_optimized.sql | 1 +
 .../test_conversion_metric_with_custom_granularity__plan0.sql    | 1 +
 ...onversion_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...t_conversion_metric_with_custom_granularity_filter__plan0.sql | 1 +
 ...on_metric_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_filter_not_in_group_by__plan0.sql | 1 +
 ...ustom_granularity_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_custom_granularity__plan0.sql    | 1 +
 ...umulative_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 .../test_derived_metric_with_custom_granularity__plan0.sql       | 1 +
 ...t_derived_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ..._join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql | 1 +
 ...ime_spine_metric_grouped_by_custom_grain__plan0_optimized.sql | 1 +
 ...ric_custom_granularity_joined_to_non_default_grain__plan0.sql | 1 +
 ..._granularity_joined_to_non_default_grain__plan0_optimized.sql | 1 +
 .../test_multiple_metrics_with_custom_granularity__plan0.sql     | 1 +
 ...multiple_metrics_with_custom_granularity__plan0_optimized.sql | 1 +
 ...ric_custom_granularity_joined_to_non_default_grain__plan0.sql | 1 +
 ..._granularity_joined_to_non_default_grain__plan0_optimized.sql | 1 +
 .../test_no_metric_custom_granularity_metric_time__plan0.sql     | 1 +
 ...no_metric_custom_granularity_metric_time__plan0_optimized.sql | 1 +
 .../test_no_metric_custom_granularity_non_metric_time__plan0.sql | 1 +
 ...etric_custom_granularity_non_metric_time__plan0_optimized.sql | 1 +
 .../test_no_metrics_with_custom_granularity_filter__plan0.sql    | 1 +
 ...o_metrics_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ics_with_custom_granularity_in_filter_and_group_by__plan0.sql | 1 +
 ...ustom_granularity_in_filter_and_group_by__plan0_optimized.sql | 1 +
 .../test_offset_metric_with_custom_granularity__plan0.sql        | 1 +
 ...st_offset_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_filter_not_in_group_by__plan0.sql | 1 +
 ...ustom_granularity_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_custom_granularity__plan0.sql        | 1 +
 ...st_simple_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...est_simple_metric_with_custom_granularity_and_join__plan0.sql | 1 +
 ..._metric_with_custom_granularity_and_join__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_custom_granularity_filter__plan0.sql | 1 +
 ...le_metric_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_in_filter_and_group_by__plan0.sql | 1 +
 ...ustom_granularity_in_filter_and_group_by__plan0_optimized.sql | 1 +
 ...st_simple_metric_with_multi_hop_custom_granularity__plan0.sql | 1 +
 ...metric_with_multi_hop_custom_granularity__plan0_optimized.sql | 1 +
 .../test_conversion_metric_with_custom_granularity__plan0.sql    | 1 +
 ...onversion_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...t_conversion_metric_with_custom_granularity_filter__plan0.sql | 1 +
 ...on_metric_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_filter_not_in_group_by__plan0.sql | 1 +
 ...ustom_granularity_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_custom_granularity__plan0.sql    | 1 +
 ...umulative_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 .../test_derived_metric_with_custom_granularity__plan0.sql       | 1 +
 ...t_derived_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ..._join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql | 1 +
 ...ime_spine_metric_grouped_by_custom_grain__plan0_optimized.sql | 1 +
 ...ric_custom_granularity_joined_to_non_default_grain__plan0.sql | 1 +
 ..._granularity_joined_to_non_default_grain__plan0_optimized.sql | 1 +
 .../test_multiple_metrics_with_custom_granularity__plan0.sql     | 1 +
 ...multiple_metrics_with_custom_granularity__plan0_optimized.sql | 1 +
 ...ric_custom_granularity_joined_to_non_default_grain__plan0.sql | 1 +
 ..._granularity_joined_to_non_default_grain__plan0_optimized.sql | 1 +
 .../test_no_metric_custom_granularity_metric_time__plan0.sql     | 1 +
 ...no_metric_custom_granularity_metric_time__plan0_optimized.sql | 1 +
 .../test_no_metric_custom_granularity_non_metric_time__plan0.sql | 1 +
 ...etric_custom_granularity_non_metric_time__plan0_optimized.sql | 1 +
 .../test_no_metrics_with_custom_granularity_filter__plan0.sql    | 1 +
 ...o_metrics_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ics_with_custom_granularity_in_filter_and_group_by__plan0.sql | 1 +
 ...ustom_granularity_in_filter_and_group_by__plan0_optimized.sql | 1 +
 .../test_offset_metric_with_custom_granularity__plan0.sql        | 1 +
 ...st_offset_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_filter_not_in_group_by__plan0.sql | 1 +
 ...ustom_granularity_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_custom_granularity__plan0.sql        | 1 +
 ...st_simple_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...est_simple_metric_with_custom_granularity_and_join__plan0.sql | 1 +
 ..._metric_with_custom_granularity_and_join__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_custom_granularity_filter__plan0.sql | 1 +
 ...le_metric_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_in_filter_and_group_by__plan0.sql | 1 +
 ...ustom_granularity_in_filter_and_group_by__plan0_optimized.sql | 1 +
 ...st_simple_metric_with_multi_hop_custom_granularity__plan0.sql | 1 +
 ...metric_with_multi_hop_custom_granularity__plan0_optimized.sql | 1 +
 .../test_conversion_metric_with_custom_granularity__plan0.sql    | 1 +
 ...onversion_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...t_conversion_metric_with_custom_granularity_filter__plan0.sql | 1 +
 ...on_metric_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_filter_not_in_group_by__plan0.sql | 1 +
 ...ustom_granularity_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_custom_granularity__plan0.sql    | 1 +
 ...umulative_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 .../test_derived_metric_with_custom_granularity__plan0.sql       | 1 +
 ...t_derived_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ..._join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql | 1 +
 ...ime_spine_metric_grouped_by_custom_grain__plan0_optimized.sql | 1 +
 ...ric_custom_granularity_joined_to_non_default_grain__plan0.sql | 1 +
 ..._granularity_joined_to_non_default_grain__plan0_optimized.sql | 1 +
 .../test_multiple_metrics_with_custom_granularity__plan0.sql     | 1 +
 ...multiple_metrics_with_custom_granularity__plan0_optimized.sql | 1 +
 ...ric_custom_granularity_joined_to_non_default_grain__plan0.sql | 1 +
 ..._granularity_joined_to_non_default_grain__plan0_optimized.sql | 1 +
 .../test_no_metric_custom_granularity_metric_time__plan0.sql     | 1 +
 ...no_metric_custom_granularity_metric_time__plan0_optimized.sql | 1 +
 .../test_no_metric_custom_granularity_non_metric_time__plan0.sql | 1 +
 ...etric_custom_granularity_non_metric_time__plan0_optimized.sql | 1 +
 .../test_no_metrics_with_custom_granularity_filter__plan0.sql    | 1 +
 ...o_metrics_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ics_with_custom_granularity_in_filter_and_group_by__plan0.sql | 1 +
 ...ustom_granularity_in_filter_and_group_by__plan0_optimized.sql | 1 +
 .../test_offset_metric_with_custom_granularity__plan0.sql        | 1 +
 ...st_offset_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_filter_not_in_group_by__plan0.sql | 1 +
 ...ustom_granularity_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_custom_granularity__plan0.sql        | 1 +
 ...st_simple_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...est_simple_metric_with_custom_granularity_and_join__plan0.sql | 1 +
 ..._metric_with_custom_granularity_and_join__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_custom_granularity_filter__plan0.sql | 1 +
 ...le_metric_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_in_filter_and_group_by__plan0.sql | 1 +
 ...ustom_granularity_in_filter_and_group_by__plan0_optimized.sql | 1 +
 ...st_simple_metric_with_multi_hop_custom_granularity__plan0.sql | 1 +
 ...metric_with_multi_hop_custom_granularity__plan0_optimized.sql | 1 +
 .../test_conversion_metric_with_custom_granularity__plan0.sql    | 1 +
 ...onversion_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...t_conversion_metric_with_custom_granularity_filter__plan0.sql | 1 +
 ...on_metric_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_filter_not_in_group_by__plan0.sql | 1 +
 ...ustom_granularity_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../test_cumulative_metric_with_custom_granularity__plan0.sql    | 1 +
 ...umulative_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 .../Trino/test_derived_metric_with_custom_granularity__plan0.sql | 1 +
 ...t_derived_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ..._join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql | 1 +
 ...ime_spine_metric_grouped_by_custom_grain__plan0_optimized.sql | 1 +
 ...ric_custom_granularity_joined_to_non_default_grain__plan0.sql | 1 +
 ..._granularity_joined_to_non_default_grain__plan0_optimized.sql | 1 +
 .../test_multiple_metrics_with_custom_granularity__plan0.sql     | 1 +
 ...multiple_metrics_with_custom_granularity__plan0_optimized.sql | 1 +
 ...ric_custom_granularity_joined_to_non_default_grain__plan0.sql | 1 +
 ..._granularity_joined_to_non_default_grain__plan0_optimized.sql | 1 +
 .../test_no_metric_custom_granularity_metric_time__plan0.sql     | 1 +
 ...no_metric_custom_granularity_metric_time__plan0_optimized.sql | 1 +
 .../test_no_metric_custom_granularity_non_metric_time__plan0.sql | 1 +
 ...etric_custom_granularity_non_metric_time__plan0_optimized.sql | 1 +
 .../test_no_metrics_with_custom_granularity_filter__plan0.sql    | 1 +
 ...o_metrics_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ics_with_custom_granularity_in_filter_and_group_by__plan0.sql | 1 +
 ...ustom_granularity_in_filter_and_group_by__plan0_optimized.sql | 1 +
 .../Trino/test_offset_metric_with_custom_granularity__plan0.sql  | 1 +
 ...st_offset_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_filter_not_in_group_by__plan0.sql | 1 +
 ...ustom_granularity_filter_not_in_group_by__plan0_optimized.sql | 1 +
 .../Trino/test_simple_metric_with_custom_granularity__plan0.sql  | 1 +
 ...st_simple_metric_with_custom_granularity__plan0_optimized.sql | 1 +
 ...est_simple_metric_with_custom_granularity_and_join__plan0.sql | 1 +
 ..._metric_with_custom_granularity_and_join__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_custom_granularity_filter__plan0.sql | 1 +
 ...le_metric_with_custom_granularity_filter__plan0_optimized.sql | 1 +
 ...ric_with_custom_granularity_in_filter_and_group_by__plan0.sql | 1 +
 ...ustom_granularity_in_filter_and_group_by__plan0_optimized.sql | 1 +
 ...st_simple_metric_with_multi_hop_custom_granularity__plan0.sql | 1 +
 ...metric_with_multi_hop_custom_granularity__plan0_optimized.sql | 1 +
 .../str/BigQuery/test_build_metric_tasks__query0.sql             | 1 +
 .../str/BigQuery/test_build_saved_query_tasks__query0.sql        | 1 +
 .../str/Databricks/test_build_metric_tasks__query0.sql           | 1 +
 .../str/Databricks/test_build_saved_query_tasks__query0.sql      | 1 +
 .../str/DuckDB/test_build_metric_tasks__query0.sql               | 1 +
 .../str/DuckDB/test_build_saved_query_tasks__query0.sql          | 1 +
 .../str/Postgres/test_build_metric_tasks__query0.sql             | 1 +
 .../str/Postgres/test_build_saved_query_tasks__query0.sql        | 1 +
 .../str/Redshift/test_build_metric_tasks__query0.sql             | 1 +
 .../str/Redshift/test_build_saved_query_tasks__query0.sql        | 1 +
 .../str/Snowflake/test_build_metric_tasks__query0.sql            | 1 +
 .../str/Snowflake/test_build_saved_query_tasks__query0.sql       | 1 +
 .../str/Trino/test_build_metric_tasks__query0.sql                | 1 +
 .../str/Trino/test_build_saved_query_tasks__query0.sql           | 1 +
 .../SqlQueryPlan/BigQuery/test_combine_output_node__plan0.sql    | 1 +
 .../BigQuery/test_combine_output_node__plan0_optimized.sql       | 1 +
 .../SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql   | 1 +
 .../BigQuery/test_compute_metrics_node__plan0_optimized.sql      | 1 +
 ...e_metrics_node_ratio_from_multiple_semantic_models__plan0.sql | 1 +
 ...node_ratio_from_multiple_semantic_models__plan0_optimized.sql | 1 +
 ...pute_metrics_node_ratio_from_single_semantic_model__plan0.sql | 1 +
 ...cs_node_ratio_from_single_semantic_model__plan0_optimized.sql | 1 +
 .../BigQuery/test_compute_metrics_node_simple_expr__plan0.sql    | 1 +
 .../test_compute_metrics_node_simple_expr__plan0_optimized.sql   | 1 +
 .../BigQuery/test_constrain_time_range_node__plan0.sql           | 1 +
 .../BigQuery/test_constrain_time_range_node__plan0_optimized.sql | 1 +
 .../test_dimension_with_joined_where_constraint__plan0.sql       | 1 +
 ...t_dimension_with_joined_where_constraint__plan0_optimized.sql | 1 +
 .../BigQuery/test_dimensions_requiring_join__plan0.sql           | 1 +
 .../BigQuery/test_dimensions_requiring_join__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/BigQuery/test_filter_node__plan0.sql            | 1 +
 .../SqlQueryPlan/BigQuery/test_filter_node__plan0_optimized.sql  | 1 +
 .../BigQuery/test_filter_with_where_constraint_node__plan0.sql   | 1 +
 .../test_filter_with_where_constraint_node__plan0_optimized.sql  | 1 +
 .../test_join_to_time_spine_node_with_offset_to_grain__plan0.sql | 1 +
 ..._to_time_spine_node_with_offset_to_grain__plan0_optimized.sql | 1 +
 .../test_join_to_time_spine_node_with_offset_window__plan0.sql   | 1 +
 ...in_to_time_spine_node_with_offset_window__plan0_optimized.sql | 1 +
 .../test_join_to_time_spine_node_without_offset__plan0.sql       | 1 +
 ...t_join_to_time_spine_node_without_offset__plan0_optimized.sql | 1 +
 .../BigQuery/test_measure_aggregation_node__plan0.sql            | 1 +
 .../BigQuery/test_measure_aggregation_node__plan0_optimized.sql  | 1 +
 .../SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql        | 1 +
 .../BigQuery/test_multi_join_node__plan0_optimized.sql           | 1 +
 .../SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql          | 1 +
 .../BigQuery/test_order_by_node__plan0_optimized.sql             | 1 +
 .../BigQuery/test_semi_additive_join_node__plan0.sql             | 1 +
 .../BigQuery/test_semi_additive_join_node__plan0_optimized.sql   | 1 +
 .../test_semi_additive_join_node_with_grouping__plan0.sql        | 1 +
 ...st_semi_additive_join_node_with_grouping__plan0_optimized.sql | 1 +
 ...test_semi_additive_join_node_with_queried_group_by__plan0.sql | 1 +
 ...additive_join_node_with_queried_group_by__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql       | 1 +
 .../BigQuery/test_single_join_node__plan0_optimized.sql          | 1 +
 .../SqlQueryPlan/BigQuery/test_source_node__plan0.sql            | 1 +
 .../SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql  | 1 +
 .../SqlQueryPlan/Databricks/test_combine_output_node__plan0.sql  | 1 +
 .../Databricks/test_combine_output_node__plan0_optimized.sql     | 1 +
 .../SqlQueryPlan/Databricks/test_compute_metrics_node__plan0.sql | 1 +
 .../Databricks/test_compute_metrics_node__plan0_optimized.sql    | 1 +
 ...e_metrics_node_ratio_from_multiple_semantic_models__plan0.sql | 1 +
 ...node_ratio_from_multiple_semantic_models__plan0_optimized.sql | 1 +
 ...pute_metrics_node_ratio_from_single_semantic_model__plan0.sql | 1 +
 ...cs_node_ratio_from_single_semantic_model__plan0_optimized.sql | 1 +
 .../Databricks/test_compute_metrics_node_simple_expr__plan0.sql  | 1 +
 .../test_compute_metrics_node_simple_expr__plan0_optimized.sql   | 1 +
 .../Databricks/test_constrain_time_range_node__plan0.sql         | 1 +
 .../test_constrain_time_range_node__plan0_optimized.sql          | 1 +
 .../test_dimension_with_joined_where_constraint__plan0.sql       | 1 +
 ...t_dimension_with_joined_where_constraint__plan0_optimized.sql | 1 +
 .../Databricks/test_dimensions_requiring_join__plan0.sql         | 1 +
 .../test_dimensions_requiring_join__plan0_optimized.sql          | 1 +
 .../SqlQueryPlan/Databricks/test_filter_node__plan0.sql          | 1 +
 .../Databricks/test_filter_node__plan0_optimized.sql             | 1 +
 .../Databricks/test_filter_with_where_constraint_node__plan0.sql | 1 +
 .../test_filter_with_where_constraint_node__plan0_optimized.sql  | 1 +
 .../test_join_to_time_spine_node_with_offset_to_grain__plan0.sql | 1 +
 ..._to_time_spine_node_with_offset_to_grain__plan0_optimized.sql | 1 +
 .../test_join_to_time_spine_node_with_offset_window__plan0.sql   | 1 +
 ...in_to_time_spine_node_with_offset_window__plan0_optimized.sql | 1 +
 .../test_join_to_time_spine_node_without_offset__plan0.sql       | 1 +
 ...t_join_to_time_spine_node_without_offset__plan0_optimized.sql | 1 +
 .../Databricks/test_measure_aggregation_node__plan0.sql          | 1 +
 .../test_measure_aggregation_node__plan0_optimized.sql           | 1 +
 .../SqlQueryPlan/Databricks/test_multi_join_node__plan0.sql      | 1 +
 .../Databricks/test_multi_join_node__plan0_optimized.sql         | 1 +
 .../SqlQueryPlan/Databricks/test_order_by_node__plan0.sql        | 1 +
 .../Databricks/test_order_by_node__plan0_optimized.sql           | 1 +
 .../Databricks/test_semi_additive_join_node__plan0.sql           | 1 +
 .../Databricks/test_semi_additive_join_node__plan0_optimized.sql | 1 +
 .../test_semi_additive_join_node_with_grouping__plan0.sql        | 1 +
 ...st_semi_additive_join_node_with_grouping__plan0_optimized.sql | 1 +
 ...test_semi_additive_join_node_with_queried_group_by__plan0.sql | 1 +
 ...additive_join_node_with_queried_group_by__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Databricks/test_single_join_node__plan0.sql     | 1 +
 .../Databricks/test_single_join_node__plan0_optimized.sql        | 1 +
 .../SqlQueryPlan/Databricks/test_source_node__plan0.sql          | 1 +
 .../Databricks/test_source_node__plan0_optimized.sql             | 1 +
 .../SqlQueryPlan/DuckDB/test_combine_output_node__plan0.sql      | 1 +
 .../DuckDB/test_combine_output_node__plan0_optimized.sql         | 1 +
 .../SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql     | 1 +
 .../DuckDB/test_compute_metrics_node__plan0_optimized.sql        | 1 +
 ...e_metrics_node_ratio_from_multiple_semantic_models__plan0.sql | 1 +
 ...node_ratio_from_multiple_semantic_models__plan0_optimized.sql | 1 +
 ...pute_metrics_node_ratio_from_single_semantic_model__plan0.sql | 1 +
 ...cs_node_ratio_from_single_semantic_model__plan0_optimized.sql | 1 +
 .../DuckDB/test_compute_metrics_node_simple_expr__plan0.sql      | 1 +
 .../test_compute_metrics_node_simple_expr__plan0_optimized.sql   | 1 +
 .../DuckDB/test_constrain_time_range_node__plan0.sql             | 1 +
 .../DuckDB/test_constrain_time_range_node__plan0_optimized.sql   | 1 +
 .../test_dimension_with_joined_where_constraint__plan0.sql       | 1 +
 ...t_dimension_with_joined_where_constraint__plan0_optimized.sql | 1 +
 .../DuckDB/test_dimensions_requiring_join__plan0.sql             | 1 +
 .../DuckDB/test_dimensions_requiring_join__plan0_optimized.sql   | 1 +
 .../SqlQueryPlan/DuckDB/test_filter_node__plan0.sql              | 1 +
 .../SqlQueryPlan/DuckDB/test_filter_node__plan0_optimized.sql    | 1 +
 .../DuckDB/test_filter_with_where_constraint_node__plan0.sql     | 1 +
 .../test_filter_with_where_constraint_node__plan0_optimized.sql  | 1 +
 .../test_join_to_time_spine_node_with_offset_to_grain__plan0.sql | 1 +
 ..._to_time_spine_node_with_offset_to_grain__plan0_optimized.sql | 1 +
 .../test_join_to_time_spine_node_with_offset_window__plan0.sql   | 1 +
 ...in_to_time_spine_node_with_offset_window__plan0_optimized.sql | 1 +
 .../test_join_to_time_spine_node_without_offset__plan0.sql       | 1 +
 ...t_join_to_time_spine_node_without_offset__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql | 1 +
 .../DuckDB/test_measure_aggregation_node__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql          | 1 +
 .../DuckDB/test_multi_join_node__plan0_optimized.sql             | 1 +
 .../SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql            | 1 +
 .../SqlQueryPlan/DuckDB/test_order_by_node__plan0_optimized.sql  | 1 +
 .../SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql  | 1 +
 .../DuckDB/test_semi_additive_join_node__plan0_optimized.sql     | 1 +
 .../DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql | 1 +
 ...st_semi_additive_join_node_with_grouping__plan0_optimized.sql | 1 +
 ...test_semi_additive_join_node_with_queried_group_by__plan0.sql | 1 +
 ...additive_join_node_with_queried_group_by__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql         | 1 +
 .../DuckDB/test_single_join_node__plan0_optimized.sql            | 1 +
 .../SqlQueryPlan/DuckDB/test_source_node__plan0.sql              | 1 +
 .../SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/Postgres/test_combine_output_node__plan0.sql    | 1 +
 .../Postgres/test_combine_output_node__plan0_optimized.sql       | 1 +
 .../SqlQueryPlan/Postgres/test_compute_metrics_node__plan0.sql   | 1 +
 .../Postgres/test_compute_metrics_node__plan0_optimized.sql      | 1 +
 ...e_metrics_node_ratio_from_multiple_semantic_models__plan0.sql | 1 +
 ...node_ratio_from_multiple_semantic_models__plan0_optimized.sql | 1 +
 ...pute_metrics_node_ratio_from_single_semantic_model__plan0.sql | 1 +
 ...cs_node_ratio_from_single_semantic_model__plan0_optimized.sql | 1 +
 .../Postgres/test_compute_metrics_node_simple_expr__plan0.sql    | 1 +
 .../test_compute_metrics_node_simple_expr__plan0_optimized.sql   | 1 +
 .../Postgres/test_constrain_time_range_node__plan0.sql           | 1 +
 .../Postgres/test_constrain_time_range_node__plan0_optimized.sql | 1 +
 .../test_dimension_with_joined_where_constraint__plan0.sql       | 1 +
 ...t_dimension_with_joined_where_constraint__plan0_optimized.sql | 1 +
 .../Postgres/test_dimensions_requiring_join__plan0.sql           | 1 +
 .../Postgres/test_dimensions_requiring_join__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Postgres/test_filter_node__plan0.sql            | 1 +
 .../SqlQueryPlan/Postgres/test_filter_node__plan0_optimized.sql  | 1 +
 .../Postgres/test_filter_with_where_constraint_node__plan0.sql   | 1 +
 .../test_filter_with_where_constraint_node__plan0_optimized.sql  | 1 +
 .../test_join_to_time_spine_node_with_offset_to_grain__plan0.sql | 1 +
 ..._to_time_spine_node_with_offset_to_grain__plan0_optimized.sql | 1 +
 .../test_join_to_time_spine_node_with_offset_window__plan0.sql   | 1 +
 ...in_to_time_spine_node_with_offset_window__plan0_optimized.sql | 1 +
 .../test_join_to_time_spine_node_without_offset__plan0.sql       | 1 +
 ...t_join_to_time_spine_node_without_offset__plan0_optimized.sql | 1 +
 .../Postgres/test_measure_aggregation_node__plan0.sql            | 1 +
 .../Postgres/test_measure_aggregation_node__plan0_optimized.sql  | 1 +
 .../SqlQueryPlan/Postgres/test_multi_join_node__plan0.sql        | 1 +
 .../Postgres/test_multi_join_node__plan0_optimized.sql           | 1 +
 .../SqlQueryPlan/Postgres/test_order_by_node__plan0.sql          | 1 +
 .../Postgres/test_order_by_node__plan0_optimized.sql             | 1 +
 .../Postgres/test_semi_additive_join_node__plan0.sql             | 1 +
 .../Postgres/test_semi_additive_join_node__plan0_optimized.sql   | 1 +
 .../test_semi_additive_join_node_with_grouping__plan0.sql        | 1 +
 ...st_semi_additive_join_node_with_grouping__plan0_optimized.sql | 1 +
 ...test_semi_additive_join_node_with_queried_group_by__plan0.sql | 1 +
 ...additive_join_node_with_queried_group_by__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Postgres/test_single_join_node__plan0.sql       | 1 +
 .../Postgres/test_single_join_node__plan0_optimized.sql          | 1 +
 .../SqlQueryPlan/Postgres/test_source_node__plan0.sql            | 1 +
 .../SqlQueryPlan/Postgres/test_source_node__plan0_optimized.sql  | 1 +
 .../SqlQueryPlan/Redshift/test_combine_output_node__plan0.sql    | 1 +
 .../Redshift/test_combine_output_node__plan0_optimized.sql       | 1 +
 .../SqlQueryPlan/Redshift/test_compute_metrics_node__plan0.sql   | 1 +
 .../Redshift/test_compute_metrics_node__plan0_optimized.sql      | 1 +
 ...e_metrics_node_ratio_from_multiple_semantic_models__plan0.sql | 1 +
 ...node_ratio_from_multiple_semantic_models__plan0_optimized.sql | 1 +
 ...pute_metrics_node_ratio_from_single_semantic_model__plan0.sql | 1 +
 ...cs_node_ratio_from_single_semantic_model__plan0_optimized.sql | 1 +
 .../Redshift/test_compute_metrics_node_simple_expr__plan0.sql    | 1 +
 .../test_compute_metrics_node_simple_expr__plan0_optimized.sql   | 1 +
 .../Redshift/test_constrain_time_range_node__plan0.sql           | 1 +
 .../Redshift/test_constrain_time_range_node__plan0_optimized.sql | 1 +
 .../test_dimension_with_joined_where_constraint__plan0.sql       | 1 +
 ...t_dimension_with_joined_where_constraint__plan0_optimized.sql | 1 +
 .../Redshift/test_dimensions_requiring_join__plan0.sql           | 1 +
 .../Redshift/test_dimensions_requiring_join__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Redshift/test_filter_node__plan0.sql            | 1 +
 .../SqlQueryPlan/Redshift/test_filter_node__plan0_optimized.sql  | 1 +
 .../Redshift/test_filter_with_where_constraint_node__plan0.sql   | 1 +
 .../test_filter_with_where_constraint_node__plan0_optimized.sql  | 1 +
 .../test_join_to_time_spine_node_with_offset_to_grain__plan0.sql | 1 +
 ..._to_time_spine_node_with_offset_to_grain__plan0_optimized.sql | 1 +
 .../test_join_to_time_spine_node_with_offset_window__plan0.sql   | 1 +
 ...in_to_time_spine_node_with_offset_window__plan0_optimized.sql | 1 +
 .../test_join_to_time_spine_node_without_offset__plan0.sql       | 1 +
 ...t_join_to_time_spine_node_without_offset__plan0_optimized.sql | 1 +
 .../Redshift/test_measure_aggregation_node__plan0.sql            | 1 +
 .../Redshift/test_measure_aggregation_node__plan0_optimized.sql  | 1 +
 .../SqlQueryPlan/Redshift/test_multi_join_node__plan0.sql        | 1 +
 .../Redshift/test_multi_join_node__plan0_optimized.sql           | 1 +
 .../SqlQueryPlan/Redshift/test_order_by_node__plan0.sql          | 1 +
 .../Redshift/test_order_by_node__plan0_optimized.sql             | 1 +
 .../Redshift/test_semi_additive_join_node__plan0.sql             | 1 +
 .../Redshift/test_semi_additive_join_node__plan0_optimized.sql   | 1 +
 .../test_semi_additive_join_node_with_grouping__plan0.sql        | 1 +
 ...st_semi_additive_join_node_with_grouping__plan0_optimized.sql | 1 +
 ...test_semi_additive_join_node_with_queried_group_by__plan0.sql | 1 +
 ...additive_join_node_with_queried_group_by__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Redshift/test_single_join_node__plan0.sql       | 1 +
 .../Redshift/test_single_join_node__plan0_optimized.sql          | 1 +
 .../SqlQueryPlan/Redshift/test_source_node__plan0.sql            | 1 +
 .../SqlQueryPlan/Redshift/test_source_node__plan0_optimized.sql  | 1 +
 .../SqlQueryPlan/Snowflake/test_combine_output_node__plan0.sql   | 1 +
 .../Snowflake/test_combine_output_node__plan0_optimized.sql      | 1 +
 .../SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0.sql  | 1 +
 .../Snowflake/test_compute_metrics_node__plan0_optimized.sql     | 1 +
 ...e_metrics_node_ratio_from_multiple_semantic_models__plan0.sql | 1 +
 ...node_ratio_from_multiple_semantic_models__plan0_optimized.sql | 1 +
 ...pute_metrics_node_ratio_from_single_semantic_model__plan0.sql | 1 +
 ...cs_node_ratio_from_single_semantic_model__plan0_optimized.sql | 1 +
 .../Snowflake/test_compute_metrics_node_simple_expr__plan0.sql   | 1 +
 .../test_compute_metrics_node_simple_expr__plan0_optimized.sql   | 1 +
 .../Snowflake/test_constrain_time_range_node__plan0.sql          | 1 +
 .../test_constrain_time_range_node__plan0_optimized.sql          | 1 +
 .../test_dimension_with_joined_where_constraint__plan0.sql       | 1 +
 ...t_dimension_with_joined_where_constraint__plan0_optimized.sql | 1 +
 .../Snowflake/test_dimensions_requiring_join__plan0.sql          | 1 +
 .../test_dimensions_requiring_join__plan0_optimized.sql          | 1 +
 .../SqlQueryPlan/Snowflake/test_filter_node__plan0.sql           | 1 +
 .../SqlQueryPlan/Snowflake/test_filter_node__plan0_optimized.sql | 1 +
 .../Snowflake/test_filter_with_where_constraint_node__plan0.sql  | 1 +
 .../test_filter_with_where_constraint_node__plan0_optimized.sql  | 1 +
 .../test_join_to_time_spine_node_with_offset_to_grain__plan0.sql | 1 +
 ..._to_time_spine_node_with_offset_to_grain__plan0_optimized.sql | 1 +
 .../test_join_to_time_spine_node_with_offset_window__plan0.sql   | 1 +
 ...in_to_time_spine_node_with_offset_window__plan0_optimized.sql | 1 +
 .../test_join_to_time_spine_node_without_offset__plan0.sql       | 1 +
 ...t_join_to_time_spine_node_without_offset__plan0_optimized.sql | 1 +
 .../Snowflake/test_measure_aggregation_node__plan0.sql           | 1 +
 .../Snowflake/test_measure_aggregation_node__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Snowflake/test_multi_join_node__plan0.sql       | 1 +
 .../Snowflake/test_multi_join_node__plan0_optimized.sql          | 1 +
 .../SqlQueryPlan/Snowflake/test_order_by_node__plan0.sql         | 1 +
 .../Snowflake/test_order_by_node__plan0_optimized.sql            | 1 +
 .../Snowflake/test_semi_additive_join_node__plan0.sql            | 1 +
 .../Snowflake/test_semi_additive_join_node__plan0_optimized.sql  | 1 +
 .../test_semi_additive_join_node_with_grouping__plan0.sql        | 1 +
 ...st_semi_additive_join_node_with_grouping__plan0_optimized.sql | 1 +
 ...test_semi_additive_join_node_with_queried_group_by__plan0.sql | 1 +
 ...additive_join_node_with_queried_group_by__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Snowflake/test_single_join_node__plan0.sql      | 1 +
 .../Snowflake/test_single_join_node__plan0_optimized.sql         | 1 +
 .../SqlQueryPlan/Snowflake/test_source_node__plan0.sql           | 1 +
 .../SqlQueryPlan/Snowflake/test_source_node__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_combine_output_node__plan0.sql       | 1 +
 .../Trino/test_combine_output_node__plan0_optimized.sql          | 1 +
 .../SqlQueryPlan/Trino/test_compute_metrics_node__plan0.sql      | 1 +
 .../Trino/test_compute_metrics_node__plan0_optimized.sql         | 1 +
 ...e_metrics_node_ratio_from_multiple_semantic_models__plan0.sql | 1 +
 ...node_ratio_from_multiple_semantic_models__plan0_optimized.sql | 1 +
 ...pute_metrics_node_ratio_from_single_semantic_model__plan0.sql | 1 +
 ...cs_node_ratio_from_single_semantic_model__plan0_optimized.sql | 1 +
 .../Trino/test_compute_metrics_node_simple_expr__plan0.sql       | 1 +
 .../test_compute_metrics_node_simple_expr__plan0_optimized.sql   | 1 +
 .../SqlQueryPlan/Trino/test_constrain_time_range_node__plan0.sql | 1 +
 .../Trino/test_constrain_time_range_node__plan0_optimized.sql    | 1 +
 .../Trino/test_dimension_with_joined_where_constraint__plan0.sql | 1 +
 ...t_dimension_with_joined_where_constraint__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0.sql | 1 +
 .../Trino/test_dimensions_requiring_join__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/Trino/test_filter_node__plan0.sql               | 1 +
 .../SqlQueryPlan/Trino/test_filter_node__plan0_optimized.sql     | 1 +
 .../Trino/test_filter_with_where_constraint_node__plan0.sql      | 1 +
 .../test_filter_with_where_constraint_node__plan0_optimized.sql  | 1 +
 .../test_join_to_time_spine_node_with_offset_to_grain__plan0.sql | 1 +
 ..._to_time_spine_node_with_offset_to_grain__plan0_optimized.sql | 1 +
 .../test_join_to_time_spine_node_with_offset_window__plan0.sql   | 1 +
 ...in_to_time_spine_node_with_offset_window__plan0_optimized.sql | 1 +
 .../Trino/test_join_to_time_spine_node_without_offset__plan0.sql | 1 +
 ...t_join_to_time_spine_node_without_offset__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_measure_aggregation_node__plan0.sql  | 1 +
 .../Trino/test_measure_aggregation_node__plan0_optimized.sql     | 1 +
 .../SqlQueryPlan/Trino/test_multi_join_node__plan0.sql           | 1 +
 .../SqlQueryPlan/Trino/test_multi_join_node__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_order_by_node__plan0.sql             | 1 +
 .../SqlQueryPlan/Trino/test_order_by_node__plan0_optimized.sql   | 1 +
 .../SqlQueryPlan/Trino/test_semi_additive_join_node__plan0.sql   | 1 +
 .../Trino/test_semi_additive_join_node__plan0_optimized.sql      | 1 +
 .../Trino/test_semi_additive_join_node_with_grouping__plan0.sql  | 1 +
 ...st_semi_additive_join_node_with_grouping__plan0_optimized.sql | 1 +
 ...test_semi_additive_join_node_with_queried_group_by__plan0.sql | 1 +
 ...additive_join_node_with_queried_group_by__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_single_join_node__plan0.sql          | 1 +
 .../Trino/test_single_join_node__plan0_optimized.sql             | 1 +
 .../SqlQueryPlan/Trino/test_source_node__plan0.sql               | 1 +
 .../SqlQueryPlan/Trino/test_source_node__plan0_optimized.sql     | 1 +
 ...cumulative_time_offset_metric_with_time_constraint__plan0.sql | 1 +
 ..._time_offset_metric_with_time_constraint__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql         | 1 +
 .../BigQuery/test_derived_metric__plan0_optimized.sql            | 1 +
 ...hat_defines_the_same_alias_in_different_components__plan0.sql | 1 +
 ...s_the_same_alias_in_different_components__plan0_optimized.sql | 1 +
 ...ived_metric_with_month_dimension_and_offset_window__plan0.sql | 1 +
 ...c_with_month_dimension_and_offset_window__plan0_optimized.sql | 1 +
 .../BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql | 1 +
 ...test_derived_metric_with_offset_to_grain__plan0_optimized.sql | 1 +
 ...erived_metric_with_offset_to_grain_and_granularity__plan0.sql | 1 +
 ...ric_with_offset_to_grain_and_granularity__plan0_optimized.sql | 1 +
 .../BigQuery/test_derived_metric_with_offset_window__plan0.sql   | 1 +
 .../test_derived_metric_with_offset_window__plan0_optimized.sql  | 1 +
 ..._derived_metric_with_offset_window_and_granularity__plan0.sql | 1 +
 ...etric_with_offset_window_and_granularity__plan0_optimized.sql | 1 +
 ...ived_metric_with_offset_window_and_offset_to_grain__plan0.sql | 1 +
 ...c_with_offset_window_and_offset_to_grain__plan0_optimized.sql | 1 +
 ..._offset_window_and_offset_to_grain_and_granularity__plan0.sql | 1 +
 ...ndow_and_offset_to_grain_and_granularity__plan0_optimized.sql | 1 +
 ..._derived_metric_with_offset_window_and_time_filter__plan0.sql | 1 +
 ...etric_with_offset_window_and_time_filter__plan0_optimized.sql | 1 +
 .../BigQuery/test_derived_offset_cumulative_metric__plan0.sql    | 1 +
 .../test_derived_offset_cumulative_metric__plan0_optimized.sql   | 1 +
 .../test_derived_offset_metric_with_agg_time_dim__plan0.sql      | 1 +
 ..._derived_offset_metric_with_agg_time_dim__plan0_optimized.sql | 1 +
 .../test_derived_offset_metric_with_one_input_metric__plan0.sql  | 1 +
 ...ived_offset_metric_with_one_input_metric__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/BigQuery/test_multi_metric_fill_null__plan0.sql | 1 +
 .../BigQuery/test_multi_metric_fill_null__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql  | 1 +
 .../BigQuery/test_nested_derived_metric__plan0_optimized.sql     | 1 +
 ...c_offset_with_joined_where_constraint_not_selected__plan0.sql | 1 +
 ...ith_joined_where_constraint_not_selected__plan0_optimized.sql | 1 +
 ..._derived_metric_with_offset_multiple_input_metrics__plan0.sql | 1 +
 ...etric_with_offset_multiple_input_metrics__plan0_optimized.sql | 1 +
 .../test_nested_fill_nulls_without_time_spine__plan0.sql         | 1 +
 ...est_nested_fill_nulls_without_time_spine__plan0_optimized.sql | 1 +
 ..._nested_fill_nulls_without_time_spine_multi_metric__plan0.sql | 1 +
 ...ll_nulls_without_time_spine_multi_metric__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/BigQuery/test_nested_filters__plan0.sql         | 1 +
 .../BigQuery/test_nested_filters__plan0_optimized.sql            | 1 +
 .../SqlQueryPlan/BigQuery/test_nested_offsets__plan0.sql         | 1 +
 .../BigQuery/test_nested_offsets__plan0_optimized.sql            | 1 +
 .../BigQuery/test_nested_offsets_with_time_constraint__plan0.sql | 1 +
 ...test_nested_offsets_with_time_constraint__plan0_optimized.sql | 1 +
 .../test_nested_offsets_with_where_constraint__plan0.sql         | 1 +
 ...est_nested_offsets_with_where_constraint__plan0_optimized.sql | 1 +
 ...tric_filter_and_query_have_different_granularities__plan0.sql | 1 +
 ...r_and_query_have_different_granularities__plan0_optimized.sql | 1 +
 ...test_offset_to_grain_metric_multiple_granularities__plan0.sql | 1 +
 ...t_to_grain_metric_multiple_granularities__plan0_optimized.sql | 1 +
 .../BigQuery/test_offset_to_grain_with_agg_time_dim__plan0.sql   | 1 +
 .../test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql  | 1 +
 ...tric_filter_and_query_have_different_granularities__plan0.sql | 1 +
 ...r_and_query_have_different_granularities__plan0_optimized.sql | 1 +
 .../test_offset_window_metric_multiple_granularities__plan0.sql  | 1 +
 ...set_window_metric_multiple_granularities__plan0_optimized.sql | 1 +
 .../BigQuery/test_offset_window_with_agg_time_dim__plan0.sql     | 1 +
 .../test_offset_window_with_agg_time_dim__plan0_optimized.sql    | 1 +
 .../test_time_offset_metric_with_time_constraint__plan0.sql      | 1 +
 ..._time_offset_metric_with_time_constraint__plan0_optimized.sql | 1 +
 ...cumulative_time_offset_metric_with_time_constraint__plan0.sql | 1 +
 ..._time_offset_metric_with_time_constraint__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Databricks/test_derived_metric__plan0.sql       | 1 +
 .../Databricks/test_derived_metric__plan0_optimized.sql          | 1 +
 ...hat_defines_the_same_alias_in_different_components__plan0.sql | 1 +
 ...s_the_same_alias_in_different_components__plan0_optimized.sql | 1 +
 ...ived_metric_with_month_dimension_and_offset_window__plan0.sql | 1 +
 ...c_with_month_dimension_and_offset_window__plan0_optimized.sql | 1 +
 .../test_derived_metric_with_offset_to_grain__plan0.sql          | 1 +
 ...test_derived_metric_with_offset_to_grain__plan0_optimized.sql | 1 +
 ...erived_metric_with_offset_to_grain_and_granularity__plan0.sql | 1 +
 ...ric_with_offset_to_grain_and_granularity__plan0_optimized.sql | 1 +
 .../Databricks/test_derived_metric_with_offset_window__plan0.sql | 1 +
 .../test_derived_metric_with_offset_window__plan0_optimized.sql  | 1 +
 ..._derived_metric_with_offset_window_and_granularity__plan0.sql | 1 +
 ...etric_with_offset_window_and_granularity__plan0_optimized.sql | 1 +
 ...ived_metric_with_offset_window_and_offset_to_grain__plan0.sql | 1 +
 ...c_with_offset_window_and_offset_to_grain__plan0_optimized.sql | 1 +
 ..._offset_window_and_offset_to_grain_and_granularity__plan0.sql | 1 +
 ...ndow_and_offset_to_grain_and_granularity__plan0_optimized.sql | 1 +
 ..._derived_metric_with_offset_window_and_time_filter__plan0.sql | 1 +
 ...etric_with_offset_window_and_time_filter__plan0_optimized.sql | 1 +
 .../Databricks/test_derived_offset_cumulative_metric__plan0.sql  | 1 +
 .../test_derived_offset_cumulative_metric__plan0_optimized.sql   | 1 +
 .../test_derived_offset_metric_with_agg_time_dim__plan0.sql      | 1 +
 ..._derived_offset_metric_with_agg_time_dim__plan0_optimized.sql | 1 +
 .../test_derived_offset_metric_with_one_input_metric__plan0.sql  | 1 +
 ...ived_offset_metric_with_one_input_metric__plan0_optimized.sql | 1 +
 .../Databricks/test_multi_metric_fill_null__plan0.sql            | 1 +
 .../Databricks/test_multi_metric_fill_null__plan0_optimized.sql  | 1 +
 .../Databricks/test_nested_derived_metric__plan0.sql             | 1 +
 .../Databricks/test_nested_derived_metric__plan0_optimized.sql   | 1 +
 ...c_offset_with_joined_where_constraint_not_selected__plan0.sql | 1 +
 ...ith_joined_where_constraint_not_selected__plan0_optimized.sql | 1 +
 ..._derived_metric_with_offset_multiple_input_metrics__plan0.sql | 1 +
 ...etric_with_offset_multiple_input_metrics__plan0_optimized.sql | 1 +
 .../test_nested_fill_nulls_without_time_spine__plan0.sql         | 1 +
 ...est_nested_fill_nulls_without_time_spine__plan0_optimized.sql | 1 +
 ..._nested_fill_nulls_without_time_spine_multi_metric__plan0.sql | 1 +
 ...ll_nulls_without_time_spine_multi_metric__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Databricks/test_nested_filters__plan0.sql       | 1 +
 .../Databricks/test_nested_filters__plan0_optimized.sql          | 1 +
 .../SqlQueryPlan/Databricks/test_nested_offsets__plan0.sql       | 1 +
 .../Databricks/test_nested_offsets__plan0_optimized.sql          | 1 +
 .../test_nested_offsets_with_time_constraint__plan0.sql          | 1 +
 ...test_nested_offsets_with_time_constraint__plan0_optimized.sql | 1 +
 .../test_nested_offsets_with_where_constraint__plan0.sql         | 1 +
 ...est_nested_offsets_with_where_constraint__plan0_optimized.sql | 1 +
 ...tric_filter_and_query_have_different_granularities__plan0.sql | 1 +
 ...r_and_query_have_different_granularities__plan0_optimized.sql | 1 +
 ...test_offset_to_grain_metric_multiple_granularities__plan0.sql | 1 +
 ...t_to_grain_metric_multiple_granularities__plan0_optimized.sql | 1 +
 .../Databricks/test_offset_to_grain_with_agg_time_dim__plan0.sql | 1 +
 .../test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql  | 1 +
 ...tric_filter_and_query_have_different_granularities__plan0.sql | 1 +
 ...r_and_query_have_different_granularities__plan0_optimized.sql | 1 +
 .../test_offset_window_metric_multiple_granularities__plan0.sql  | 1 +
 ...set_window_metric_multiple_granularities__plan0_optimized.sql | 1 +
 .../Databricks/test_offset_window_with_agg_time_dim__plan0.sql   | 1 +
 .../test_offset_window_with_agg_time_dim__plan0_optimized.sql    | 1 +
 .../test_time_offset_metric_with_time_constraint__plan0.sql      | 1 +
 ..._time_offset_metric_with_time_constraint__plan0_optimized.sql | 1 +
 ...cumulative_time_offset_metric_with_time_constraint__plan0.sql | 1 +
 ..._time_offset_metric_with_time_constraint__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql           | 1 +
 .../SqlQueryPlan/DuckDB/test_derived_metric__plan0_optimized.sql | 1 +
 ...hat_defines_the_same_alias_in_different_components__plan0.sql | 1 +
 ...s_the_same_alias_in_different_components__plan0_optimized.sql | 1 +
 ...ived_metric_with_month_dimension_and_offset_window__plan0.sql | 1 +
 ...c_with_month_dimension_and_offset_window__plan0_optimized.sql | 1 +
 .../DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql   | 1 +
 ...test_derived_metric_with_offset_to_grain__plan0_optimized.sql | 1 +
 ...erived_metric_with_offset_to_grain_and_granularity__plan0.sql | 1 +
 ...ric_with_offset_to_grain_and_granularity__plan0_optimized.sql | 1 +
 .../DuckDB/test_derived_metric_with_offset_window__plan0.sql     | 1 +
 .../test_derived_metric_with_offset_window__plan0_optimized.sql  | 1 +
 ..._derived_metric_with_offset_window_and_granularity__plan0.sql | 1 +
 ...etric_with_offset_window_and_granularity__plan0_optimized.sql | 1 +
 ...ived_metric_with_offset_window_and_offset_to_grain__plan0.sql | 1 +
 ...c_with_offset_window_and_offset_to_grain__plan0_optimized.sql | 1 +
 ..._offset_window_and_offset_to_grain_and_granularity__plan0.sql | 1 +
 ...ndow_and_offset_to_grain_and_granularity__plan0_optimized.sql | 1 +
 ..._derived_metric_with_offset_window_and_time_filter__plan0.sql | 1 +
 ...etric_with_offset_window_and_time_filter__plan0_optimized.sql | 1 +
 .../DuckDB/test_derived_offset_cumulative_metric__plan0.sql      | 1 +
 .../test_derived_offset_cumulative_metric__plan0_optimized.sql   | 1 +
 .../test_derived_offset_metric_with_agg_time_dim__plan0.sql      | 1 +
 ..._derived_offset_metric_with_agg_time_dim__plan0_optimized.sql | 1 +
 .../test_derived_offset_metric_with_one_input_metric__plan0.sql  | 1 +
 ...ived_offset_metric_with_one_input_metric__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/DuckDB/test_multi_metric_fill_null__plan0.sql   | 1 +
 .../DuckDB/test_multi_metric_fill_null__plan0_optimized.sql      | 1 +
 .../SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql    | 1 +
 .../DuckDB/test_nested_derived_metric__plan0_optimized.sql       | 1 +
 ...c_offset_with_joined_where_constraint_not_selected__plan0.sql | 1 +
 ...ith_joined_where_constraint_not_selected__plan0_optimized.sql | 1 +
 ..._derived_metric_with_offset_multiple_input_metrics__plan0.sql | 1 +
 ...etric_with_offset_multiple_input_metrics__plan0_optimized.sql | 1 +
 .../DuckDB/test_nested_fill_nulls_without_time_spine__plan0.sql  | 1 +
 ...est_nested_fill_nulls_without_time_spine__plan0_optimized.sql | 1 +
 ..._nested_fill_nulls_without_time_spine_multi_metric__plan0.sql | 1 +
 ...ll_nulls_without_time_spine_multi_metric__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/DuckDB/test_nested_filters__plan0.sql           | 1 +
 .../SqlQueryPlan/DuckDB/test_nested_filters__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/DuckDB/test_nested_offsets__plan0.sql           | 1 +
 .../SqlQueryPlan/DuckDB/test_nested_offsets__plan0_optimized.sql | 1 +
 .../DuckDB/test_nested_offsets_with_time_constraint__plan0.sql   | 1 +
 ...test_nested_offsets_with_time_constraint__plan0_optimized.sql | 1 +
 .../DuckDB/test_nested_offsets_with_where_constraint__plan0.sql  | 1 +
 ...est_nested_offsets_with_where_constraint__plan0_optimized.sql | 1 +
 ...tric_filter_and_query_have_different_granularities__plan0.sql | 1 +
 ...r_and_query_have_different_granularities__plan0_optimized.sql | 1 +
 ...test_offset_to_grain_metric_multiple_granularities__plan0.sql | 1 +
 ...t_to_grain_metric_multiple_granularities__plan0_optimized.sql | 1 +
 .../DuckDB/test_offset_to_grain_with_agg_time_dim__plan0.sql     | 1 +
 .../test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql  | 1 +
 ...tric_filter_and_query_have_different_granularities__plan0.sql | 1 +
 ...r_and_query_have_different_granularities__plan0_optimized.sql | 1 +
 .../test_offset_window_metric_multiple_granularities__plan0.sql  | 1 +
 ...set_window_metric_multiple_granularities__plan0_optimized.sql | 1 +
 .../DuckDB/test_offset_window_with_agg_time_dim__plan0.sql       | 1 +
 .../test_offset_window_with_agg_time_dim__plan0_optimized.sql    | 1 +
 .../test_time_offset_metric_with_time_constraint__plan0.sql      | 1 +
 ..._time_offset_metric_with_time_constraint__plan0_optimized.sql | 1 +
 ...cumulative_time_offset_metric_with_time_constraint__plan0.sql | 1 +
 ..._time_offset_metric_with_time_constraint__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Postgres/test_derived_metric__plan0.sql         | 1 +
 .../Postgres/test_derived_metric__plan0_optimized.sql            | 1 +
 ...hat_defines_the_same_alias_in_different_components__plan0.sql | 1 +
 ...s_the_same_alias_in_different_components__plan0_optimized.sql | 1 +
 ...ived_metric_with_month_dimension_and_offset_window__plan0.sql | 1 +
 ...c_with_month_dimension_and_offset_window__plan0_optimized.sql | 1 +
 .../Postgres/test_derived_metric_with_offset_to_grain__plan0.sql | 1 +
 ...test_derived_metric_with_offset_to_grain__plan0_optimized.sql | 1 +
 ...erived_metric_with_offset_to_grain_and_granularity__plan0.sql | 1 +
 ...ric_with_offset_to_grain_and_granularity__plan0_optimized.sql | 1 +
 .../Postgres/test_derived_metric_with_offset_window__plan0.sql   | 1 +
 .../test_derived_metric_with_offset_window__plan0_optimized.sql  | 1 +
 ..._derived_metric_with_offset_window_and_granularity__plan0.sql | 1 +
 ...etric_with_offset_window_and_granularity__plan0_optimized.sql | 1 +
 ...ived_metric_with_offset_window_and_offset_to_grain__plan0.sql | 1 +
 ...c_with_offset_window_and_offset_to_grain__plan0_optimized.sql | 1 +
 ..._offset_window_and_offset_to_grain_and_granularity__plan0.sql | 1 +
 ...ndow_and_offset_to_grain_and_granularity__plan0_optimized.sql | 1 +
 ..._derived_metric_with_offset_window_and_time_filter__plan0.sql | 1 +
 ...etric_with_offset_window_and_time_filter__plan0_optimized.sql | 1 +
 .../Postgres/test_derived_offset_cumulative_metric__plan0.sql    | 1 +
 .../test_derived_offset_cumulative_metric__plan0_optimized.sql   | 1 +
 .../test_derived_offset_metric_with_agg_time_dim__plan0.sql      | 1 +
 ..._derived_offset_metric_with_agg_time_dim__plan0_optimized.sql | 1 +
 .../test_derived_offset_metric_with_one_input_metric__plan0.sql  | 1 +
 ...ived_offset_metric_with_one_input_metric__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Postgres/test_multi_metric_fill_null__plan0.sql | 1 +
 .../Postgres/test_multi_metric_fill_null__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql  | 1 +
 .../Postgres/test_nested_derived_metric__plan0_optimized.sql     | 1 +
 ...c_offset_with_joined_where_constraint_not_selected__plan0.sql | 1 +
 ...ith_joined_where_constraint_not_selected__plan0_optimized.sql | 1 +
 ..._derived_metric_with_offset_multiple_input_metrics__plan0.sql | 1 +
 ...etric_with_offset_multiple_input_metrics__plan0_optimized.sql | 1 +
 .../test_nested_fill_nulls_without_time_spine__plan0.sql         | 1 +
 ...est_nested_fill_nulls_without_time_spine__plan0_optimized.sql | 1 +
 ..._nested_fill_nulls_without_time_spine_multi_metric__plan0.sql | 1 +
 ...ll_nulls_without_time_spine_multi_metric__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Postgres/test_nested_filters__plan0.sql         | 1 +
 .../Postgres/test_nested_filters__plan0_optimized.sql            | 1 +
 .../SqlQueryPlan/Postgres/test_nested_offsets__plan0.sql         | 1 +
 .../Postgres/test_nested_offsets__plan0_optimized.sql            | 1 +
 .../Postgres/test_nested_offsets_with_time_constraint__plan0.sql | 1 +
 ...test_nested_offsets_with_time_constraint__plan0_optimized.sql | 1 +
 .../test_nested_offsets_with_where_constraint__plan0.sql         | 1 +
 ...est_nested_offsets_with_where_constraint__plan0_optimized.sql | 1 +
 ...tric_filter_and_query_have_different_granularities__plan0.sql | 1 +
 ...r_and_query_have_different_granularities__plan0_optimized.sql | 1 +
 ...test_offset_to_grain_metric_multiple_granularities__plan0.sql | 1 +
 ...t_to_grain_metric_multiple_granularities__plan0_optimized.sql | 1 +
 .../Postgres/test_offset_to_grain_with_agg_time_dim__plan0.sql   | 1 +
 .../test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql  | 1 +
 ...tric_filter_and_query_have_different_granularities__plan0.sql | 1 +
 ...r_and_query_have_different_granularities__plan0_optimized.sql | 1 +
 .../test_offset_window_metric_multiple_granularities__plan0.sql  | 1 +
 ...set_window_metric_multiple_granularities__plan0_optimized.sql | 1 +
 .../Postgres/test_offset_window_with_agg_time_dim__plan0.sql     | 1 +
 .../test_offset_window_with_agg_time_dim__plan0_optimized.sql    | 1 +
 .../test_time_offset_metric_with_time_constraint__plan0.sql      | 1 +
 ..._time_offset_metric_with_time_constraint__plan0_optimized.sql | 1 +
 ...cumulative_time_offset_metric_with_time_constraint__plan0.sql | 1 +
 ..._time_offset_metric_with_time_constraint__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Redshift/test_derived_metric__plan0.sql         | 1 +
 .../Redshift/test_derived_metric__plan0_optimized.sql            | 1 +
 ...hat_defines_the_same_alias_in_different_components__plan0.sql | 1 +
 ...s_the_same_alias_in_different_components__plan0_optimized.sql | 1 +
 ...ived_metric_with_month_dimension_and_offset_window__plan0.sql | 1 +
 ...c_with_month_dimension_and_offset_window__plan0_optimized.sql | 1 +
 .../Redshift/test_derived_metric_with_offset_to_grain__plan0.sql | 1 +
 ...test_derived_metric_with_offset_to_grain__plan0_optimized.sql | 1 +
 ...erived_metric_with_offset_to_grain_and_granularity__plan0.sql | 1 +
 ...ric_with_offset_to_grain_and_granularity__plan0_optimized.sql | 1 +
 .../Redshift/test_derived_metric_with_offset_window__plan0.sql   | 1 +
 .../test_derived_metric_with_offset_window__plan0_optimized.sql  | 1 +
 ..._derived_metric_with_offset_window_and_granularity__plan0.sql | 1 +
 ...etric_with_offset_window_and_granularity__plan0_optimized.sql | 1 +
 ...ived_metric_with_offset_window_and_offset_to_grain__plan0.sql | 1 +
 ...c_with_offset_window_and_offset_to_grain__plan0_optimized.sql | 1 +
 ..._offset_window_and_offset_to_grain_and_granularity__plan0.sql | 1 +
 ...ndow_and_offset_to_grain_and_granularity__plan0_optimized.sql | 1 +
 ..._derived_metric_with_offset_window_and_time_filter__plan0.sql | 1 +
 ...etric_with_offset_window_and_time_filter__plan0_optimized.sql | 1 +
 .../Redshift/test_derived_offset_cumulative_metric__plan0.sql    | 1 +
 .../test_derived_offset_cumulative_metric__plan0_optimized.sql   | 1 +
 .../test_derived_offset_metric_with_agg_time_dim__plan0.sql      | 1 +
 ..._derived_offset_metric_with_agg_time_dim__plan0_optimized.sql | 1 +
 .../test_derived_offset_metric_with_one_input_metric__plan0.sql  | 1 +
 ...ived_offset_metric_with_one_input_metric__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Redshift/test_multi_metric_fill_null__plan0.sql | 1 +
 .../Redshift/test_multi_metric_fill_null__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql  | 1 +
 .../Redshift/test_nested_derived_metric__plan0_optimized.sql     | 1 +
 ...c_offset_with_joined_where_constraint_not_selected__plan0.sql | 1 +
 ...ith_joined_where_constraint_not_selected__plan0_optimized.sql | 1 +
 ..._derived_metric_with_offset_multiple_input_metrics__plan0.sql | 1 +
 ...etric_with_offset_multiple_input_metrics__plan0_optimized.sql | 1 +
 .../test_nested_fill_nulls_without_time_spine__plan0.sql         | 1 +
 ...est_nested_fill_nulls_without_time_spine__plan0_optimized.sql | 1 +
 ..._nested_fill_nulls_without_time_spine_multi_metric__plan0.sql | 1 +
 ...ll_nulls_without_time_spine_multi_metric__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Redshift/test_nested_filters__plan0.sql         | 1 +
 .../Redshift/test_nested_filters__plan0_optimized.sql            | 1 +
 .../SqlQueryPlan/Redshift/test_nested_offsets__plan0.sql         | 1 +
 .../Redshift/test_nested_offsets__plan0_optimized.sql            | 1 +
 .../Redshift/test_nested_offsets_with_time_constraint__plan0.sql | 1 +
 ...test_nested_offsets_with_time_constraint__plan0_optimized.sql | 1 +
 .../test_nested_offsets_with_where_constraint__plan0.sql         | 1 +
 ...est_nested_offsets_with_where_constraint__plan0_optimized.sql | 1 +
 ...tric_filter_and_query_have_different_granularities__plan0.sql | 1 +
 ...r_and_query_have_different_granularities__plan0_optimized.sql | 1 +
 ...test_offset_to_grain_metric_multiple_granularities__plan0.sql | 1 +
 ...t_to_grain_metric_multiple_granularities__plan0_optimized.sql | 1 +
 .../Redshift/test_offset_to_grain_with_agg_time_dim__plan0.sql   | 1 +
 .../test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql  | 1 +
 ...tric_filter_and_query_have_different_granularities__plan0.sql | 1 +
 ...r_and_query_have_different_granularities__plan0_optimized.sql | 1 +
 .../test_offset_window_metric_multiple_granularities__plan0.sql  | 1 +
 ...set_window_metric_multiple_granularities__plan0_optimized.sql | 1 +
 .../Redshift/test_offset_window_with_agg_time_dim__plan0.sql     | 1 +
 .../test_offset_window_with_agg_time_dim__plan0_optimized.sql    | 1 +
 .../test_time_offset_metric_with_time_constraint__plan0.sql      | 1 +
 ..._time_offset_metric_with_time_constraint__plan0_optimized.sql | 1 +
 ...cumulative_time_offset_metric_with_time_constraint__plan0.sql | 1 +
 ..._time_offset_metric_with_time_constraint__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql        | 1 +
 .../Snowflake/test_derived_metric__plan0_optimized.sql           | 1 +
 ...hat_defines_the_same_alias_in_different_components__plan0.sql | 1 +
 ...s_the_same_alias_in_different_components__plan0_optimized.sql | 1 +
 ...ived_metric_with_month_dimension_and_offset_window__plan0.sql | 1 +
 ...c_with_month_dimension_and_offset_window__plan0_optimized.sql | 1 +
 .../test_derived_metric_with_offset_to_grain__plan0.sql          | 1 +
 ...test_derived_metric_with_offset_to_grain__plan0_optimized.sql | 1 +
 ...erived_metric_with_offset_to_grain_and_granularity__plan0.sql | 1 +
 ...ric_with_offset_to_grain_and_granularity__plan0_optimized.sql | 1 +
 .../Snowflake/test_derived_metric_with_offset_window__plan0.sql  | 1 +
 .../test_derived_metric_with_offset_window__plan0_optimized.sql  | 1 +
 ..._derived_metric_with_offset_window_and_granularity__plan0.sql | 1 +
 ...etric_with_offset_window_and_granularity__plan0_optimized.sql | 1 +
 ...ived_metric_with_offset_window_and_offset_to_grain__plan0.sql | 1 +
 ...c_with_offset_window_and_offset_to_grain__plan0_optimized.sql | 1 +
 ..._offset_window_and_offset_to_grain_and_granularity__plan0.sql | 1 +
 ...ndow_and_offset_to_grain_and_granularity__plan0_optimized.sql | 1 +
 ..._derived_metric_with_offset_window_and_time_filter__plan0.sql | 1 +
 ...etric_with_offset_window_and_time_filter__plan0_optimized.sql | 1 +
 .../Snowflake/test_derived_offset_cumulative_metric__plan0.sql   | 1 +
 .../test_derived_offset_cumulative_metric__plan0_optimized.sql   | 1 +
 .../test_derived_offset_metric_with_agg_time_dim__plan0.sql      | 1 +
 ..._derived_offset_metric_with_agg_time_dim__plan0_optimized.sql | 1 +
 .../test_derived_offset_metric_with_one_input_metric__plan0.sql  | 1 +
 ...ived_offset_metric_with_one_input_metric__plan0_optimized.sql | 1 +
 .../Snowflake/test_multi_metric_fill_null__plan0.sql             | 1 +
 .../Snowflake/test_multi_metric_fill_null__plan0_optimized.sql   | 1 +
 .../SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql | 1 +
 .../Snowflake/test_nested_derived_metric__plan0_optimized.sql    | 1 +
 ...c_offset_with_joined_where_constraint_not_selected__plan0.sql | 1 +
 ...ith_joined_where_constraint_not_selected__plan0_optimized.sql | 1 +
 ..._derived_metric_with_offset_multiple_input_metrics__plan0.sql | 1 +
 ...etric_with_offset_multiple_input_metrics__plan0_optimized.sql | 1 +
 .../test_nested_fill_nulls_without_time_spine__plan0.sql         | 1 +
 ...est_nested_fill_nulls_without_time_spine__plan0_optimized.sql | 1 +
 ..._nested_fill_nulls_without_time_spine_multi_metric__plan0.sql | 1 +
 ...ll_nulls_without_time_spine_multi_metric__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Snowflake/test_nested_filters__plan0.sql        | 1 +
 .../Snowflake/test_nested_filters__plan0_optimized.sql           | 1 +
 .../SqlQueryPlan/Snowflake/test_nested_offsets__plan0.sql        | 1 +
 .../Snowflake/test_nested_offsets__plan0_optimized.sql           | 1 +
 .../test_nested_offsets_with_time_constraint__plan0.sql          | 1 +
 ...test_nested_offsets_with_time_constraint__plan0_optimized.sql | 1 +
 .../test_nested_offsets_with_where_constraint__plan0.sql         | 1 +
 ...est_nested_offsets_with_where_constraint__plan0_optimized.sql | 1 +
 ...tric_filter_and_query_have_different_granularities__plan0.sql | 1 +
 ...r_and_query_have_different_granularities__plan0_optimized.sql | 1 +
 ...test_offset_to_grain_metric_multiple_granularities__plan0.sql | 1 +
 ...t_to_grain_metric_multiple_granularities__plan0_optimized.sql | 1 +
 .../Snowflake/test_offset_to_grain_with_agg_time_dim__plan0.sql  | 1 +
 .../test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql  | 1 +
 ...tric_filter_and_query_have_different_granularities__plan0.sql | 1 +
 ...r_and_query_have_different_granularities__plan0_optimized.sql | 1 +
 .../test_offset_window_metric_multiple_granularities__plan0.sql  | 1 +
 ...set_window_metric_multiple_granularities__plan0_optimized.sql | 1 +
 .../Snowflake/test_offset_window_with_agg_time_dim__plan0.sql    | 1 +
 .../test_offset_window_with_agg_time_dim__plan0_optimized.sql    | 1 +
 .../test_time_offset_metric_with_time_constraint__plan0.sql      | 1 +
 ..._time_offset_metric_with_time_constraint__plan0_optimized.sql | 1 +
 ...cumulative_time_offset_metric_with_time_constraint__plan0.sql | 1 +
 ..._time_offset_metric_with_time_constraint__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_derived_metric__plan0.sql            | 1 +
 .../SqlQueryPlan/Trino/test_derived_metric__plan0_optimized.sql  | 1 +
 ...hat_defines_the_same_alias_in_different_components__plan0.sql | 1 +
 ...s_the_same_alias_in_different_components__plan0_optimized.sql | 1 +
 ...ived_metric_with_month_dimension_and_offset_window__plan0.sql | 1 +
 ...c_with_month_dimension_and_offset_window__plan0_optimized.sql | 1 +
 .../Trino/test_derived_metric_with_offset_to_grain__plan0.sql    | 1 +
 ...test_derived_metric_with_offset_to_grain__plan0_optimized.sql | 1 +
 ...erived_metric_with_offset_to_grain_and_granularity__plan0.sql | 1 +
 ...ric_with_offset_to_grain_and_granularity__plan0_optimized.sql | 1 +
 .../Trino/test_derived_metric_with_offset_window__plan0.sql      | 1 +
 .../test_derived_metric_with_offset_window__plan0_optimized.sql  | 1 +
 ..._derived_metric_with_offset_window_and_granularity__plan0.sql | 1 +
 ...etric_with_offset_window_and_granularity__plan0_optimized.sql | 1 +
 ...ived_metric_with_offset_window_and_offset_to_grain__plan0.sql | 1 +
 ...c_with_offset_window_and_offset_to_grain__plan0_optimized.sql | 1 +
 ..._offset_window_and_offset_to_grain_and_granularity__plan0.sql | 1 +
 ...ndow_and_offset_to_grain_and_granularity__plan0_optimized.sql | 1 +
 ..._derived_metric_with_offset_window_and_time_filter__plan0.sql | 1 +
 ...etric_with_offset_window_and_time_filter__plan0_optimized.sql | 1 +
 .../Trino/test_derived_offset_cumulative_metric__plan0.sql       | 1 +
 .../test_derived_offset_cumulative_metric__plan0_optimized.sql   | 1 +
 .../test_derived_offset_metric_with_agg_time_dim__plan0.sql      | 1 +
 ..._derived_offset_metric_with_agg_time_dim__plan0_optimized.sql | 1 +
 .../test_derived_offset_metric_with_one_input_metric__plan0.sql  | 1 +
 ...ived_offset_metric_with_one_input_metric__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_multi_metric_fill_null__plan0.sql    | 1 +
 .../Trino/test_multi_metric_fill_null__plan0_optimized.sql       | 1 +
 .../SqlQueryPlan/Trino/test_nested_derived_metric__plan0.sql     | 1 +
 .../Trino/test_nested_derived_metric__plan0_optimized.sql        | 1 +
 ...c_offset_with_joined_where_constraint_not_selected__plan0.sql | 1 +
 ...ith_joined_where_constraint_not_selected__plan0_optimized.sql | 1 +
 ..._derived_metric_with_offset_multiple_input_metrics__plan0.sql | 1 +
 ...etric_with_offset_multiple_input_metrics__plan0_optimized.sql | 1 +
 .../Trino/test_nested_fill_nulls_without_time_spine__plan0.sql   | 1 +
 ...est_nested_fill_nulls_without_time_spine__plan0_optimized.sql | 1 +
 ..._nested_fill_nulls_without_time_spine_multi_metric__plan0.sql | 1 +
 ...ll_nulls_without_time_spine_multi_metric__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_nested_filters__plan0.sql            | 1 +
 .../SqlQueryPlan/Trino/test_nested_filters__plan0_optimized.sql  | 1 +
 .../SqlQueryPlan/Trino/test_nested_offsets__plan0.sql            | 1 +
 .../SqlQueryPlan/Trino/test_nested_offsets__plan0_optimized.sql  | 1 +
 .../Trino/test_nested_offsets_with_time_constraint__plan0.sql    | 1 +
 ...test_nested_offsets_with_time_constraint__plan0_optimized.sql | 1 +
 .../Trino/test_nested_offsets_with_where_constraint__plan0.sql   | 1 +
 ...est_nested_offsets_with_where_constraint__plan0_optimized.sql | 1 +
 ...tric_filter_and_query_have_different_granularities__plan0.sql | 1 +
 ...r_and_query_have_different_granularities__plan0_optimized.sql | 1 +
 ...test_offset_to_grain_metric_multiple_granularities__plan0.sql | 1 +
 ...t_to_grain_metric_multiple_granularities__plan0_optimized.sql | 1 +
 .../Trino/test_offset_to_grain_with_agg_time_dim__plan0.sql      | 1 +
 .../test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql  | 1 +
 ...tric_filter_and_query_have_different_granularities__plan0.sql | 1 +
 ...r_and_query_have_different_granularities__plan0_optimized.sql | 1 +
 .../test_offset_window_metric_multiple_granularities__plan0.sql  | 1 +
 ...set_window_metric_multiple_granularities__plan0_optimized.sql | 1 +
 .../Trino/test_offset_window_with_agg_time_dim__plan0.sql        | 1 +
 .../test_offset_window_with_agg_time_dim__plan0_optimized.sql    | 1 +
 .../test_time_offset_metric_with_time_constraint__plan0.sql      | 1 +
 ..._time_offset_metric_with_time_constraint__plan0_optimized.sql | 1 +
 .../test_dimension_values_with_a_join_and_a_filter__plan0.sql    | 1 +
 ...imension_values_with_a_join_and_a_filter__plan0_optimized.sql | 1 +
 .../BigQuery/test_dimensions_requiring_join__plan0.sql           | 1 +
 .../BigQuery/test_dimensions_requiring_join__plan0_optimized.sql | 1 +
 .../test_dimension_values_with_a_join_and_a_filter__plan0.sql    | 1 +
 ...imension_values_with_a_join_and_a_filter__plan0_optimized.sql | 1 +
 .../Databricks/test_dimensions_requiring_join__plan0.sql         | 1 +
 .../test_dimensions_requiring_join__plan0_optimized.sql          | 1 +
 .../test_dimension_values_with_a_join_and_a_filter__plan0.sql    | 1 +
 ...imension_values_with_a_join_and_a_filter__plan0_optimized.sql | 1 +
 .../DuckDB/test_dimensions_requiring_join__plan0.sql             | 1 +
 .../DuckDB/test_dimensions_requiring_join__plan0_optimized.sql   | 1 +
 .../test_dimension_values_with_a_join_and_a_filter__plan0.sql    | 1 +
 ...imension_values_with_a_join_and_a_filter__plan0_optimized.sql | 1 +
 .../Postgres/test_dimensions_requiring_join__plan0.sql           | 1 +
 .../Postgres/test_dimensions_requiring_join__plan0_optimized.sql | 1 +
 .../test_dimension_values_with_a_join_and_a_filter__plan0.sql    | 1 +
 ...imension_values_with_a_join_and_a_filter__plan0_optimized.sql | 1 +
 .../Redshift/test_dimensions_requiring_join__plan0.sql           | 1 +
 .../Redshift/test_dimensions_requiring_join__plan0_optimized.sql | 1 +
 .../test_dimension_values_with_a_join_and_a_filter__plan0.sql    | 1 +
 ...imension_values_with_a_join_and_a_filter__plan0_optimized.sql | 1 +
 .../Snowflake/test_dimensions_requiring_join__plan0.sql          | 1 +
 .../test_dimensions_requiring_join__plan0_optimized.sql          | 1 +
 .../test_dimension_values_with_a_join_and_a_filter__plan0.sql    | 1 +
 ...imension_values_with_a_join_and_a_filter__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0.sql | 1 +
 .../Trino/test_dimensions_requiring_join__plan0_optimized.sql    | 1 +
 .../test_approximate_continuous_percentile_expr__plan0.sql       | 1 +
 .../SqlQueryPlan/BigQuery/test_cast_to_timestamp__plan0.sql      | 1 +
 .../SqlQueryPlan/BigQuery/test_generate_uuid__plan0.sql          | 1 +
 .../test_approximate_discrete_percentile_expr__plan0.sql         | 1 +
 .../SqlQueryPlan/Databricks/test_cast_to_timestamp__plan0.sql    | 1 +
 .../Databricks/test_continuous_percentile_expr__plan0.sql        | 1 +
 .../SqlQueryPlan/Databricks/test_generate_uuid__plan0.sql        | 1 +
 .../test_approximate_continuous_percentile_expr__plan0.sql       | 1 +
 .../SqlQueryPlan/DuckDB/test_cast_to_timestamp__plan0.sql        | 1 +
 .../DuckDB/test_continuous_percentile_expr__plan0.sql            | 1 +
 .../SqlQueryPlan/DuckDB/test_discrete_percentile_expr__plan0.sql | 1 +
 .../SqlQueryPlan/DuckDB/test_generate_uuid__plan0.sql            | 1 +
 .../SqlQueryPlan/Postgres/test_cast_to_timestamp__plan0.sql      | 1 +
 .../Postgres/test_continuous_percentile_expr__plan0.sql          | 1 +
 .../Postgres/test_discrete_percentile_expr__plan0.sql            | 1 +
 .../SqlQueryPlan/Postgres/test_generate_uuid__plan0.sql          | 1 +
 .../test_approximate_discrete_percentile_expr__plan0.sql         | 1 +
 .../SqlQueryPlan/Redshift/test_cast_to_timestamp__plan0.sql      | 1 +
 .../Redshift/test_continuous_percentile_expr__plan0.sql          | 1 +
 .../SqlQueryPlan/Redshift/test_generate_uuid__plan0.sql          | 1 +
 .../test_approximate_continuous_percentile_expr__plan0.sql       | 1 +
 .../SqlQueryPlan/Snowflake/test_cast_to_timestamp__plan0.sql     | 1 +
 .../Snowflake/test_continuous_percentile_expr__plan0.sql         | 1 +
 .../Snowflake/test_discrete_percentile_expr__plan0.sql           | 1 +
 .../SqlQueryPlan/Snowflake/test_generate_uuid__plan0.sql         | 1 +
 .../Trino/test_approximate_continuous_percentile_expr__plan0.sql | 1 +
 .../SqlQueryPlan/Trino/test_cast_to_timestamp__plan0.sql         | 1 +
 .../SqlQueryPlan/Trino/test_generate_uuid__plan0.sql             | 1 +
 .../SqlQueryPlan/BigQuery/test_cumulative_fill_nulls__plan0.sql  | 1 +
 .../BigQuery/test_cumulative_fill_nulls__plan0_optimized.sql     | 1 +
 .../test_derived_fill_nulls_for_one_input_metric__plan0.sql      | 1 +
 ..._derived_fill_nulls_for_one_input_metric__plan0_optimized.sql | 1 +
 ...est_join_to_time_spine_with_filter_not_in_group_by__plan0.sql | 1 +
 ...o_time_spine_with_filter_not_in_group_by__plan0_optimized.sql | 1 +
 ...e_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql | 1 +
 ...th_filter_not_in_group_by_using_agg_time__plan0_optimized.sql | 1 +
 ...ter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql | 1 +
 ..._group_by_using_agg_time_and_metric_time__plan0_optimized.sql | 1 +
 ...in_to_time_spine_with_filter_smaller_than_group_by__plan0.sql | 1 +
 ..._spine_with_filter_smaller_than_group_by__plan0_optimized.sql | 1 +
 .../BigQuery/test_join_to_time_spine_with_filters__plan0.sql     | 1 +
 .../test_join_to_time_spine_with_filters__plan0_optimized.sql    | 1 +
 .../test_simple_fill_nulls_with_0_metric_time__plan0.sql         | 1 +
 ...est_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql | 1 +
 .../BigQuery/test_simple_fill_nulls_with_0_month__plan0.sql      | 1 +
 .../test_simple_fill_nulls_with_0_month__plan0_optimized.sql     | 1 +
 ...imple_fill_nulls_with_0_with_categorical_dimension__plan0.sql | 1 +
 ..._nulls_with_0_with_categorical_dimension__plan0_optimized.sql | 1 +
 ...test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql | 1 +
 ...e_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql | 1 +
 .../test_simple_fill_nulls_without_time_spine__plan0.sql         | 1 +
 ...est_simple_fill_nulls_without_time_spine__plan0_optimized.sql | 1 +
 .../Databricks/test_cumulative_fill_nulls__plan0.sql             | 1 +
 .../Databricks/test_cumulative_fill_nulls__plan0_optimized.sql   | 1 +
 .../test_derived_fill_nulls_for_one_input_metric__plan0.sql      | 1 +
 ..._derived_fill_nulls_for_one_input_metric__plan0_optimized.sql | 1 +
 ...est_join_to_time_spine_with_filter_not_in_group_by__plan0.sql | 1 +
 ...o_time_spine_with_filter_not_in_group_by__plan0_optimized.sql | 1 +
 ...e_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql | 1 +
 ...th_filter_not_in_group_by_using_agg_time__plan0_optimized.sql | 1 +
 ...ter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql | 1 +
 ..._group_by_using_agg_time_and_metric_time__plan0_optimized.sql | 1 +
 ...in_to_time_spine_with_filter_smaller_than_group_by__plan0.sql | 1 +
 ..._spine_with_filter_smaller_than_group_by__plan0_optimized.sql | 1 +
 .../Databricks/test_join_to_time_spine_with_filters__plan0.sql   | 1 +
 .../test_join_to_time_spine_with_filters__plan0_optimized.sql    | 1 +
 .../test_simple_fill_nulls_with_0_metric_time__plan0.sql         | 1 +
 ...est_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql | 1 +
 .../Databricks/test_simple_fill_nulls_with_0_month__plan0.sql    | 1 +
 .../test_simple_fill_nulls_with_0_month__plan0_optimized.sql     | 1 +
 ...imple_fill_nulls_with_0_with_categorical_dimension__plan0.sql | 1 +
 ..._nulls_with_0_with_categorical_dimension__plan0_optimized.sql | 1 +
 ...test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql | 1 +
 ...e_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql | 1 +
 .../test_simple_fill_nulls_without_time_spine__plan0.sql         | 1 +
 ...est_simple_fill_nulls_without_time_spine__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/DuckDB/test_cumulative_fill_nulls__plan0.sql    | 1 +
 .../DuckDB/test_cumulative_fill_nulls__plan0_optimized.sql       | 1 +
 .../test_derived_fill_nulls_for_one_input_metric__plan0.sql      | 1 +
 ..._derived_fill_nulls_for_one_input_metric__plan0_optimized.sql | 1 +
 ...est_join_to_time_spine_with_filter_not_in_group_by__plan0.sql | 1 +
 ...o_time_spine_with_filter_not_in_group_by__plan0_optimized.sql | 1 +
 ...e_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql | 1 +
 ...th_filter_not_in_group_by_using_agg_time__plan0_optimized.sql | 1 +
 ...ter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql | 1 +
 ..._group_by_using_agg_time_and_metric_time__plan0_optimized.sql | 1 +
 ...in_to_time_spine_with_filter_smaller_than_group_by__plan0.sql | 1 +
 ..._spine_with_filter_smaller_than_group_by__plan0_optimized.sql | 1 +
 .../DuckDB/test_join_to_time_spine_with_filters__plan0.sql       | 1 +
 .../test_join_to_time_spine_with_filters__plan0_optimized.sql    | 1 +
 .../DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0.sql  | 1 +
 ...est_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql | 1 +
 .../DuckDB/test_simple_fill_nulls_with_0_month__plan0.sql        | 1 +
 .../test_simple_fill_nulls_with_0_month__plan0_optimized.sql     | 1 +
 ...imple_fill_nulls_with_0_with_categorical_dimension__plan0.sql | 1 +
 ..._nulls_with_0_with_categorical_dimension__plan0_optimized.sql | 1 +
 ...test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql | 1 +
 ...e_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql | 1 +
 .../DuckDB/test_simple_fill_nulls_without_time_spine__plan0.sql  | 1 +
 ...est_simple_fill_nulls_without_time_spine__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Postgres/test_cumulative_fill_nulls__plan0.sql  | 1 +
 .../Postgres/test_cumulative_fill_nulls__plan0_optimized.sql     | 1 +
 .../test_derived_fill_nulls_for_one_input_metric__plan0.sql      | 1 +
 ..._derived_fill_nulls_for_one_input_metric__plan0_optimized.sql | 1 +
 ...est_join_to_time_spine_with_filter_not_in_group_by__plan0.sql | 1 +
 ...o_time_spine_with_filter_not_in_group_by__plan0_optimized.sql | 1 +
 ...e_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql | 1 +
 ...th_filter_not_in_group_by_using_agg_time__plan0_optimized.sql | 1 +
 ...ter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql | 1 +
 ..._group_by_using_agg_time_and_metric_time__plan0_optimized.sql | 1 +
 ...in_to_time_spine_with_filter_smaller_than_group_by__plan0.sql | 1 +
 ..._spine_with_filter_smaller_than_group_by__plan0_optimized.sql | 1 +
 .../Postgres/test_join_to_time_spine_with_filters__plan0.sql     | 1 +
 .../test_join_to_time_spine_with_filters__plan0_optimized.sql    | 1 +
 .../test_simple_fill_nulls_with_0_metric_time__plan0.sql         | 1 +
 ...est_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql | 1 +
 .../Postgres/test_simple_fill_nulls_with_0_month__plan0.sql      | 1 +
 .../test_simple_fill_nulls_with_0_month__plan0_optimized.sql     | 1 +
 ...imple_fill_nulls_with_0_with_categorical_dimension__plan0.sql | 1 +
 ..._nulls_with_0_with_categorical_dimension__plan0_optimized.sql | 1 +
 ...test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql | 1 +
 ...e_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql | 1 +
 .../test_simple_fill_nulls_without_time_spine__plan0.sql         | 1 +
 ...est_simple_fill_nulls_without_time_spine__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Redshift/test_cumulative_fill_nulls__plan0.sql  | 1 +
 .../Redshift/test_cumulative_fill_nulls__plan0_optimized.sql     | 1 +
 .../test_derived_fill_nulls_for_one_input_metric__plan0.sql      | 1 +
 ..._derived_fill_nulls_for_one_input_metric__plan0_optimized.sql | 1 +
 ...est_join_to_time_spine_with_filter_not_in_group_by__plan0.sql | 1 +
 ...o_time_spine_with_filter_not_in_group_by__plan0_optimized.sql | 1 +
 ...e_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql | 1 +
 ...th_filter_not_in_group_by_using_agg_time__plan0_optimized.sql | 1 +
 ...ter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql | 1 +
 ..._group_by_using_agg_time_and_metric_time__plan0_optimized.sql | 1 +
 ...in_to_time_spine_with_filter_smaller_than_group_by__plan0.sql | 1 +
 ..._spine_with_filter_smaller_than_group_by__plan0_optimized.sql | 1 +
 .../Redshift/test_join_to_time_spine_with_filters__plan0.sql     | 1 +
 .../test_join_to_time_spine_with_filters__plan0_optimized.sql    | 1 +
 .../test_simple_fill_nulls_with_0_metric_time__plan0.sql         | 1 +
 ...est_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql | 1 +
 .../Redshift/test_simple_fill_nulls_with_0_month__plan0.sql      | 1 +
 .../test_simple_fill_nulls_with_0_month__plan0_optimized.sql     | 1 +
 ...imple_fill_nulls_with_0_with_categorical_dimension__plan0.sql | 1 +
 ..._nulls_with_0_with_categorical_dimension__plan0_optimized.sql | 1 +
 ...test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql | 1 +
 ...e_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql | 1 +
 .../test_simple_fill_nulls_without_time_spine__plan0.sql         | 1 +
 ...est_simple_fill_nulls_without_time_spine__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Snowflake/test_cumulative_fill_nulls__plan0.sql | 1 +
 .../Snowflake/test_cumulative_fill_nulls__plan0_optimized.sql    | 1 +
 .../test_derived_fill_nulls_for_one_input_metric__plan0.sql      | 1 +
 ..._derived_fill_nulls_for_one_input_metric__plan0_optimized.sql | 1 +
 ...est_join_to_time_spine_with_filter_not_in_group_by__plan0.sql | 1 +
 ...o_time_spine_with_filter_not_in_group_by__plan0_optimized.sql | 1 +
 ...e_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql | 1 +
 ...th_filter_not_in_group_by_using_agg_time__plan0_optimized.sql | 1 +
 ...ter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql | 1 +
 ..._group_by_using_agg_time_and_metric_time__plan0_optimized.sql | 1 +
 ...in_to_time_spine_with_filter_smaller_than_group_by__plan0.sql | 1 +
 ..._spine_with_filter_smaller_than_group_by__plan0_optimized.sql | 1 +
 .../Snowflake/test_join_to_time_spine_with_filters__plan0.sql    | 1 +
 .../test_join_to_time_spine_with_filters__plan0_optimized.sql    | 1 +
 .../test_simple_fill_nulls_with_0_metric_time__plan0.sql         | 1 +
 ...est_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql | 1 +
 .../Snowflake/test_simple_fill_nulls_with_0_month__plan0.sql     | 1 +
 .../test_simple_fill_nulls_with_0_month__plan0_optimized.sql     | 1 +
 ...imple_fill_nulls_with_0_with_categorical_dimension__plan0.sql | 1 +
 ..._nulls_with_0_with_categorical_dimension__plan0_optimized.sql | 1 +
 ...test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql | 1 +
 ...e_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql | 1 +
 .../test_simple_fill_nulls_without_time_spine__plan0.sql         | 1 +
 ...est_simple_fill_nulls_without_time_spine__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_cumulative_fill_nulls__plan0.sql     | 1 +
 .../Trino/test_cumulative_fill_nulls__plan0_optimized.sql        | 1 +
 .../test_derived_fill_nulls_for_one_input_metric__plan0.sql      | 1 +
 ..._derived_fill_nulls_for_one_input_metric__plan0_optimized.sql | 1 +
 ...est_join_to_time_spine_with_filter_not_in_group_by__plan0.sql | 1 +
 ...o_time_spine_with_filter_not_in_group_by__plan0_optimized.sql | 1 +
 ...e_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql | 1 +
 ...th_filter_not_in_group_by_using_agg_time__plan0_optimized.sql | 1 +
 ...ter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql | 1 +
 ..._group_by_using_agg_time_and_metric_time__plan0_optimized.sql | 1 +
 ...in_to_time_spine_with_filter_smaller_than_group_by__plan0.sql | 1 +
 ..._spine_with_filter_smaller_than_group_by__plan0_optimized.sql | 1 +
 .../Trino/test_join_to_time_spine_with_filters__plan0.sql        | 1 +
 .../test_join_to_time_spine_with_filters__plan0_optimized.sql    | 1 +
 .../Trino/test_simple_fill_nulls_with_0_metric_time__plan0.sql   | 1 +
 ...est_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql | 1 +
 .../Trino/test_simple_fill_nulls_with_0_month__plan0.sql         | 1 +
 .../test_simple_fill_nulls_with_0_month__plan0_optimized.sql     | 1 +
 ...imple_fill_nulls_with_0_with_categorical_dimension__plan0.sql | 1 +
 ..._nulls_with_0_with_categorical_dimension__plan0_optimized.sql | 1 +
 ...test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql | 1 +
 ...e_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql | 1 +
 .../Trino/test_simple_fill_nulls_without_time_spine__plan0.sql   | 1 +
 ...est_simple_fill_nulls_without_time_spine__plan0_optimized.sql | 1 +
 .../BigQuery/test_offset_window_with_date_part__plan0.sql        | 1 +
 .../test_offset_window_with_date_part__plan0_optimized.sql       | 1 +
 ...test_simple_metric_with_joined_sub_daily_dimension__plan0.sql | 1 +
 ...e_metric_with_joined_sub_daily_dimension__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_sub_daily_dimension__plan0.sql       | 1 +
 ...t_simple_metric_with_sub_daily_dimension__plan0_optimized.sql | 1 +
 .../BigQuery/test_simple_query_with_date_part__plan0.sql         | 1 +
 .../test_simple_query_with_date_part__plan0_optimized.sql        | 1 +
 .../test_simple_query_with_multiple_date_parts__plan0.sql        | 1 +
 ...st_simple_query_with_multiple_date_parts__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/BigQuery/test_sub_daily_dimension__plan0.sql    | 1 +
 .../BigQuery/test_sub_daily_dimension__plan0_optimized.sql       | 1 +
 .../SqlQueryPlan/BigQuery/test_sub_daily_metric_time__plan0.sql  | 1 +
 .../BigQuery/test_sub_daily_metric_time__plan0_optimized.sql     | 1 +
 .../test_subdaily_cumulative_grain_to_date_metric__plan0.sql     | 1 +
 ...subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql | 1 +
 .../BigQuery/test_subdaily_cumulative_window_metric__plan0.sql   | 1 +
 .../test_subdaily_cumulative_window_metric__plan0_optimized.sql  | 1 +
 ...y_granularity_overrides_metric_default_granularity__plan0.sql | 1 +
 ...ity_overrides_metric_default_granularity__plan0_optimized.sql | 1 +
 .../BigQuery/test_subdaily_join_to_time_spine_metric__plan0.sql  | 1 +
 .../test_subdaily_join_to_time_spine_metric__plan0_optimized.sql | 1 +
 .../BigQuery/test_subdaily_offset_to_grain_metric__plan0.sql     | 1 +
 .../test_subdaily_offset_to_grain_metric__plan0_optimized.sql    | 1 +
 .../BigQuery/test_subdaily_offset_window_metric__plan0.sql       | 1 +
 .../test_subdaily_offset_window_metric__plan0_optimized.sql      | 1 +
 .../test_subdaily_time_constraint_with_metric__plan0.sql         | 1 +
 ...est_subdaily_time_constraint_with_metric__plan0_optimized.sql | 1 +
 .../test_subdaily_time_constraint_without_metrics__plan0.sql     | 1 +
 ...subdaily_time_constraint_without_metrics__plan0_optimized.sql | 1 +
 .../Databricks/test_offset_window_with_date_part__plan0.sql      | 1 +
 .../test_offset_window_with_date_part__plan0_optimized.sql       | 1 +
 ...test_simple_metric_with_joined_sub_daily_dimension__plan0.sql | 1 +
 ...e_metric_with_joined_sub_daily_dimension__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_sub_daily_dimension__plan0.sql       | 1 +
 ...t_simple_metric_with_sub_daily_dimension__plan0_optimized.sql | 1 +
 .../Databricks/test_simple_query_with_date_part__plan0.sql       | 1 +
 .../test_simple_query_with_date_part__plan0_optimized.sql        | 1 +
 .../test_simple_query_with_multiple_date_parts__plan0.sql        | 1 +
 ...st_simple_query_with_multiple_date_parts__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Databricks/test_sub_daily_dimension__plan0.sql  | 1 +
 .../Databricks/test_sub_daily_dimension__plan0_optimized.sql     | 1 +
 .../Databricks/test_sub_daily_metric_time__plan0.sql             | 1 +
 .../Databricks/test_sub_daily_metric_time__plan0_optimized.sql   | 1 +
 .../test_subdaily_cumulative_grain_to_date_metric__plan0.sql     | 1 +
 ...subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql | 1 +
 .../Databricks/test_subdaily_cumulative_window_metric__plan0.sql | 1 +
 .../test_subdaily_cumulative_window_metric__plan0_optimized.sql  | 1 +
 ...y_granularity_overrides_metric_default_granularity__plan0.sql | 1 +
 ...ity_overrides_metric_default_granularity__plan0_optimized.sql | 1 +
 .../test_subdaily_join_to_time_spine_metric__plan0.sql           | 1 +
 .../test_subdaily_join_to_time_spine_metric__plan0_optimized.sql | 1 +
 .../Databricks/test_subdaily_offset_to_grain_metric__plan0.sql   | 1 +
 .../test_subdaily_offset_to_grain_metric__plan0_optimized.sql    | 1 +
 .../Databricks/test_subdaily_offset_window_metric__plan0.sql     | 1 +
 .../test_subdaily_offset_window_metric__plan0_optimized.sql      | 1 +
 .../test_subdaily_time_constraint_with_metric__plan0.sql         | 1 +
 ...est_subdaily_time_constraint_with_metric__plan0_optimized.sql | 1 +
 .../test_subdaily_time_constraint_without_metrics__plan0.sql     | 1 +
 ...subdaily_time_constraint_without_metrics__plan0_optimized.sql | 1 +
 .../DuckDB/test_offset_window_with_date_part__plan0.sql          | 1 +
 .../test_offset_window_with_date_part__plan0_optimized.sql       | 1 +
 ...test_simple_metric_with_joined_sub_daily_dimension__plan0.sql | 1 +
 ...e_metric_with_joined_sub_daily_dimension__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_sub_daily_dimension__plan0.sql       | 1 +
 ...t_simple_metric_with_sub_daily_dimension__plan0_optimized.sql | 1 +
 .../DuckDB/test_simple_query_with_date_part__plan0.sql           | 1 +
 .../DuckDB/test_simple_query_with_date_part__plan0_optimized.sql | 1 +
 .../DuckDB/test_simple_query_with_multiple_date_parts__plan0.sql | 1 +
 ...st_simple_query_with_multiple_date_parts__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/DuckDB/test_sub_daily_dimension__plan0.sql      | 1 +
 .../DuckDB/test_sub_daily_dimension__plan0_optimized.sql         | 1 +
 .../SqlQueryPlan/DuckDB/test_sub_daily_metric_time__plan0.sql    | 1 +
 .../DuckDB/test_sub_daily_metric_time__plan0_optimized.sql       | 1 +
 .../test_subdaily_cumulative_grain_to_date_metric__plan0.sql     | 1 +
 ...subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql | 1 +
 .../DuckDB/test_subdaily_cumulative_window_metric__plan0.sql     | 1 +
 .../test_subdaily_cumulative_window_metric__plan0_optimized.sql  | 1 +
 ...y_granularity_overrides_metric_default_granularity__plan0.sql | 1 +
 ...ity_overrides_metric_default_granularity__plan0_optimized.sql | 1 +
 .../DuckDB/test_subdaily_join_to_time_spine_metric__plan0.sql    | 1 +
 .../test_subdaily_join_to_time_spine_metric__plan0_optimized.sql | 1 +
 .../DuckDB/test_subdaily_offset_to_grain_metric__plan0.sql       | 1 +
 .../test_subdaily_offset_to_grain_metric__plan0_optimized.sql    | 1 +
 .../DuckDB/test_subdaily_offset_window_metric__plan0.sql         | 1 +
 .../test_subdaily_offset_window_metric__plan0_optimized.sql      | 1 +
 .../DuckDB/test_subdaily_time_constraint_with_metric__plan0.sql  | 1 +
 ...est_subdaily_time_constraint_with_metric__plan0_optimized.sql | 1 +
 .../test_subdaily_time_constraint_without_metrics__plan0.sql     | 1 +
 ...subdaily_time_constraint_without_metrics__plan0_optimized.sql | 1 +
 .../Postgres/test_offset_window_with_date_part__plan0.sql        | 1 +
 .../test_offset_window_with_date_part__plan0_optimized.sql       | 1 +
 ...test_simple_metric_with_joined_sub_daily_dimension__plan0.sql | 1 +
 ...e_metric_with_joined_sub_daily_dimension__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_sub_daily_dimension__plan0.sql       | 1 +
 ...t_simple_metric_with_sub_daily_dimension__plan0_optimized.sql | 1 +
 .../Postgres/test_simple_query_with_date_part__plan0.sql         | 1 +
 .../test_simple_query_with_date_part__plan0_optimized.sql        | 1 +
 .../test_simple_query_with_multiple_date_parts__plan0.sql        | 1 +
 ...st_simple_query_with_multiple_date_parts__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Postgres/test_sub_daily_dimension__plan0.sql    | 1 +
 .../Postgres/test_sub_daily_dimension__plan0_optimized.sql       | 1 +
 .../SqlQueryPlan/Postgres/test_sub_daily_metric_time__plan0.sql  | 1 +
 .../Postgres/test_sub_daily_metric_time__plan0_optimized.sql     | 1 +
 .../test_subdaily_cumulative_grain_to_date_metric__plan0.sql     | 1 +
 ...subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql | 1 +
 .../Postgres/test_subdaily_cumulative_window_metric__plan0.sql   | 1 +
 .../test_subdaily_cumulative_window_metric__plan0_optimized.sql  | 1 +
 ...y_granularity_overrides_metric_default_granularity__plan0.sql | 1 +
 ...ity_overrides_metric_default_granularity__plan0_optimized.sql | 1 +
 .../Postgres/test_subdaily_join_to_time_spine_metric__plan0.sql  | 1 +
 .../test_subdaily_join_to_time_spine_metric__plan0_optimized.sql | 1 +
 .../Postgres/test_subdaily_offset_to_grain_metric__plan0.sql     | 1 +
 .../test_subdaily_offset_to_grain_metric__plan0_optimized.sql    | 1 +
 .../Postgres/test_subdaily_offset_window_metric__plan0.sql       | 1 +
 .../test_subdaily_offset_window_metric__plan0_optimized.sql      | 1 +
 .../test_subdaily_time_constraint_with_metric__plan0.sql         | 1 +
 ...est_subdaily_time_constraint_with_metric__plan0_optimized.sql | 1 +
 .../test_subdaily_time_constraint_without_metrics__plan0.sql     | 1 +
 ...subdaily_time_constraint_without_metrics__plan0_optimized.sql | 1 +
 .../Redshift/test_offset_window_with_date_part__plan0.sql        | 1 +
 .../test_offset_window_with_date_part__plan0_optimized.sql       | 1 +
 ...test_simple_metric_with_joined_sub_daily_dimension__plan0.sql | 1 +
 ...e_metric_with_joined_sub_daily_dimension__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_sub_daily_dimension__plan0.sql       | 1 +
 ...t_simple_metric_with_sub_daily_dimension__plan0_optimized.sql | 1 +
 .../Redshift/test_simple_query_with_date_part__plan0.sql         | 1 +
 .../test_simple_query_with_date_part__plan0_optimized.sql        | 1 +
 .../test_simple_query_with_multiple_date_parts__plan0.sql        | 1 +
 ...st_simple_query_with_multiple_date_parts__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Redshift/test_sub_daily_dimension__plan0.sql    | 1 +
 .../Redshift/test_sub_daily_dimension__plan0_optimized.sql       | 1 +
 .../SqlQueryPlan/Redshift/test_sub_daily_metric_time__plan0.sql  | 1 +
 .../Redshift/test_sub_daily_metric_time__plan0_optimized.sql     | 1 +
 .../test_subdaily_cumulative_grain_to_date_metric__plan0.sql     | 1 +
 ...subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql | 1 +
 .../Redshift/test_subdaily_cumulative_window_metric__plan0.sql   | 1 +
 .../test_subdaily_cumulative_window_metric__plan0_optimized.sql  | 1 +
 ...y_granularity_overrides_metric_default_granularity__plan0.sql | 1 +
 ...ity_overrides_metric_default_granularity__plan0_optimized.sql | 1 +
 .../Redshift/test_subdaily_join_to_time_spine_metric__plan0.sql  | 1 +
 .../test_subdaily_join_to_time_spine_metric__plan0_optimized.sql | 1 +
 .../Redshift/test_subdaily_offset_to_grain_metric__plan0.sql     | 1 +
 .../test_subdaily_offset_to_grain_metric__plan0_optimized.sql    | 1 +
 .../Redshift/test_subdaily_offset_window_metric__plan0.sql       | 1 +
 .../test_subdaily_offset_window_metric__plan0_optimized.sql      | 1 +
 .../test_subdaily_time_constraint_with_metric__plan0.sql         | 1 +
 ...est_subdaily_time_constraint_with_metric__plan0_optimized.sql | 1 +
 .../test_subdaily_time_constraint_without_metrics__plan0.sql     | 1 +
 ...subdaily_time_constraint_without_metrics__plan0_optimized.sql | 1 +
 .../Snowflake/test_offset_window_with_date_part__plan0.sql       | 1 +
 .../test_offset_window_with_date_part__plan0_optimized.sql       | 1 +
 ...test_simple_metric_with_joined_sub_daily_dimension__plan0.sql | 1 +
 ...e_metric_with_joined_sub_daily_dimension__plan0_optimized.sql | 1 +
 .../test_simple_metric_with_sub_daily_dimension__plan0.sql       | 1 +
 ...t_simple_metric_with_sub_daily_dimension__plan0_optimized.sql | 1 +
 .../Snowflake/test_simple_query_with_date_part__plan0.sql        | 1 +
 .../test_simple_query_with_date_part__plan0_optimized.sql        | 1 +
 .../test_simple_query_with_multiple_date_parts__plan0.sql        | 1 +
 ...st_simple_query_with_multiple_date_parts__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Snowflake/test_sub_daily_dimension__plan0.sql   | 1 +
 .../Snowflake/test_sub_daily_dimension__plan0_optimized.sql      | 1 +
 .../SqlQueryPlan/Snowflake/test_sub_daily_metric_time__plan0.sql | 1 +
 .../Snowflake/test_sub_daily_metric_time__plan0_optimized.sql    | 1 +
 .../test_subdaily_cumulative_grain_to_date_metric__plan0.sql     | 1 +
 ...subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql | 1 +
 .../Snowflake/test_subdaily_cumulative_window_metric__plan0.sql  | 1 +
 .../test_subdaily_cumulative_window_metric__plan0_optimized.sql  | 1 +
 ...y_granularity_overrides_metric_default_granularity__plan0.sql | 1 +
 ...ity_overrides_metric_default_granularity__plan0_optimized.sql | 1 +
 .../Snowflake/test_subdaily_join_to_time_spine_metric__plan0.sql | 1 +
 .../test_subdaily_join_to_time_spine_metric__plan0_optimized.sql | 1 +
 .../Snowflake/test_subdaily_offset_to_grain_metric__plan0.sql    | 1 +
 .../test_subdaily_offset_to_grain_metric__plan0_optimized.sql    | 1 +
 .../Snowflake/test_subdaily_offset_window_metric__plan0.sql      | 1 +
 .../test_subdaily_offset_window_metric__plan0_optimized.sql      | 1 +
 .../test_subdaily_time_constraint_with_metric__plan0.sql         | 1 +
 ...est_subdaily_time_constraint_with_metric__plan0_optimized.sql | 1 +
 .../test_subdaily_time_constraint_without_metrics__plan0.sql     | 1 +
 ...subdaily_time_constraint_without_metrics__plan0_optimized.sql | 1 +
 .../Trino/test_offset_window_with_date_part__plan0.sql           | 1 +
 .../Trino/test_offset_window_with_date_part__plan0_optimized.sql | 1 +
 ...test_simple_metric_with_joined_sub_daily_dimension__plan0.sql | 1 +
 ...e_metric_with_joined_sub_daily_dimension__plan0_optimized.sql | 1 +
 .../Trino/test_simple_metric_with_sub_daily_dimension__plan0.sql | 1 +
 ...t_simple_metric_with_sub_daily_dimension__plan0_optimized.sql | 1 +
 .../Trino/test_simple_query_with_date_part__plan0.sql            | 1 +
 .../Trino/test_simple_query_with_date_part__plan0_optimized.sql  | 1 +
 .../Trino/test_simple_query_with_multiple_date_parts__plan0.sql  | 1 +
 ...st_simple_query_with_multiple_date_parts__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_sub_daily_dimension__plan0.sql       | 1 +
 .../Trino/test_sub_daily_dimension__plan0_optimized.sql          | 1 +
 .../SqlQueryPlan/Trino/test_sub_daily_metric_time__plan0.sql     | 1 +
 .../Trino/test_sub_daily_metric_time__plan0_optimized.sql        | 1 +
 .../test_subdaily_cumulative_grain_to_date_metric__plan0.sql     | 1 +
 ...subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql | 1 +
 .../Trino/test_subdaily_cumulative_window_metric__plan0.sql      | 1 +
 .../test_subdaily_cumulative_window_metric__plan0_optimized.sql  | 1 +
 ...y_granularity_overrides_metric_default_granularity__plan0.sql | 1 +
 ...ity_overrides_metric_default_granularity__plan0_optimized.sql | 1 +
 .../Trino/test_subdaily_join_to_time_spine_metric__plan0.sql     | 1 +
 .../test_subdaily_join_to_time_spine_metric__plan0_optimized.sql | 1 +
 .../Trino/test_subdaily_offset_to_grain_metric__plan0.sql        | 1 +
 .../test_subdaily_offset_to_grain_metric__plan0_optimized.sql    | 1 +
 .../Trino/test_subdaily_offset_window_metric__plan0.sql          | 1 +
 .../test_subdaily_offset_window_metric__plan0_optimized.sql      | 1 +
 .../Trino/test_subdaily_time_constraint_with_metric__plan0.sql   | 1 +
 ...est_subdaily_time_constraint_with_metric__plan0_optimized.sql | 1 +
 .../test_subdaily_time_constraint_without_metrics__plan0.sql     | 1 +
 ...subdaily_time_constraint_without_metrics__plan0_optimized.sql | 1 +
 .../test_distinct_values_query_with_metric_filter__plan0.sql     | 1 +
 ...distinct_values_query_with_metric_filter__plan0_optimized.sql | 1 +
 ...by_metric_in_same_semantic_model_as_queried_metric__plan0.sql | 1 +
 ...in_same_semantic_model_as_queried_metric__plan0_optimized.sql | 1 +
 .../BigQuery/test_filter_with_conversion_metric__plan0.sql       | 1 +
 .../test_filter_with_conversion_metric__plan0_optimized.sql      | 1 +
 .../BigQuery/test_group_by_has_local_entity_prefix__plan0.sql    | 1 +
 .../test_group_by_has_local_entity_prefix__plan0_optimized.sql   | 1 +
 .../SqlQueryPlan/BigQuery/test_inner_query_multi_hop__plan0.sql  | 1 +
 .../BigQuery/test_inner_query_multi_hop__plan0_optimized.sql     | 1 +
 .../SqlQueryPlan/BigQuery/test_inner_query_single_hop__plan0.sql | 1 +
 .../BigQuery/test_inner_query_single_hop__plan0_optimized.sql    | 1 +
 .../BigQuery/test_metric_filtered_by_itself__plan0.sql           | 1 +
 .../BigQuery/test_metric_filtered_by_itself__plan0_optimized.sql | 1 +
 .../BigQuery/test_metric_with_metric_in_where_filter__plan0.sql  | 1 +
 .../test_metric_with_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_cumulative_metric_in_where_filter__plan0.sql | 1 +
 ...y_with_cumulative_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_derived_metric_in_where_filter__plan0.sql    | 1 +
 ...uery_with_derived_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_multiple_metrics_in_filter__plan0.sql        | 1 +
 ...st_query_with_multiple_metrics_in_filter__plan0_optimized.sql | 1 +
 .../test_query_with_ratio_metric_in_where_filter__plan0.sql      | 1 +
 ..._query_with_ratio_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_simple_metric_in_where_filter__plan0.sql     | 1 +
 ...query_with_simple_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_distinct_values_query_with_metric_filter__plan0.sql     | 1 +
 ...distinct_values_query_with_metric_filter__plan0_optimized.sql | 1 +
 ...by_metric_in_same_semantic_model_as_queried_metric__plan0.sql | 1 +
 ...in_same_semantic_model_as_queried_metric__plan0_optimized.sql | 1 +
 .../Databricks/test_filter_with_conversion_metric__plan0.sql     | 1 +
 .../test_filter_with_conversion_metric__plan0_optimized.sql      | 1 +
 .../Databricks/test_group_by_has_local_entity_prefix__plan0.sql  | 1 +
 .../test_group_by_has_local_entity_prefix__plan0_optimized.sql   | 1 +
 .../Databricks/test_inner_query_multi_hop__plan0.sql             | 1 +
 .../Databricks/test_inner_query_multi_hop__plan0_optimized.sql   | 1 +
 .../Databricks/test_inner_query_single_hop__plan0.sql            | 1 +
 .../Databricks/test_inner_query_single_hop__plan0_optimized.sql  | 1 +
 .../Databricks/test_metric_filtered_by_itself__plan0.sql         | 1 +
 .../test_metric_filtered_by_itself__plan0_optimized.sql          | 1 +
 .../test_metric_with_metric_in_where_filter__plan0.sql           | 1 +
 .../test_metric_with_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_cumulative_metric_in_where_filter__plan0.sql | 1 +
 ...y_with_cumulative_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_derived_metric_in_where_filter__plan0.sql    | 1 +
 ...uery_with_derived_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_multiple_metrics_in_filter__plan0.sql        | 1 +
 ...st_query_with_multiple_metrics_in_filter__plan0_optimized.sql | 1 +
 .../test_query_with_ratio_metric_in_where_filter__plan0.sql      | 1 +
 ..._query_with_ratio_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_simple_metric_in_where_filter__plan0.sql     | 1 +
 ...query_with_simple_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_distinct_values_query_with_metric_filter__plan0.sql     | 1 +
 ...distinct_values_query_with_metric_filter__plan0_optimized.sql | 1 +
 ...by_metric_in_same_semantic_model_as_queried_metric__plan0.sql | 1 +
 ...in_same_semantic_model_as_queried_metric__plan0_optimized.sql | 1 +
 .../DuckDB/test_filter_with_conversion_metric__plan0.sql         | 1 +
 .../test_filter_with_conversion_metric__plan0_optimized.sql      | 1 +
 .../DuckDB/test_group_by_has_local_entity_prefix__plan0.sql      | 1 +
 .../test_group_by_has_local_entity_prefix__plan0_optimized.sql   | 1 +
 .../SqlQueryPlan/DuckDB/test_inner_query_multi_hop__plan0.sql    | 1 +
 .../DuckDB/test_inner_query_multi_hop__plan0_optimized.sql       | 1 +
 .../SqlQueryPlan/DuckDB/test_inner_query_single_hop__plan0.sql   | 1 +
 .../DuckDB/test_inner_query_single_hop__plan0_optimized.sql      | 1 +
 .../DuckDB/test_metric_filtered_by_itself__plan0.sql             | 1 +
 .../DuckDB/test_metric_filtered_by_itself__plan0_optimized.sql   | 1 +
 .../DuckDB/test_metric_with_metric_in_where_filter__plan0.sql    | 1 +
 .../test_metric_with_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_cumulative_metric_in_where_filter__plan0.sql | 1 +
 ...y_with_cumulative_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_derived_metric_in_where_filter__plan0.sql    | 1 +
 ...uery_with_derived_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../DuckDB/test_query_with_multiple_metrics_in_filter__plan0.sql | 1 +
 ...st_query_with_multiple_metrics_in_filter__plan0_optimized.sql | 1 +
 .../test_query_with_ratio_metric_in_where_filter__plan0.sql      | 1 +
 ..._query_with_ratio_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_simple_metric_in_where_filter__plan0.sql     | 1 +
 ...query_with_simple_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_distinct_values_query_with_metric_filter__plan0.sql     | 1 +
 ...distinct_values_query_with_metric_filter__plan0_optimized.sql | 1 +
 ...by_metric_in_same_semantic_model_as_queried_metric__plan0.sql | 1 +
 ...in_same_semantic_model_as_queried_metric__plan0_optimized.sql | 1 +
 .../Postgres/test_filter_with_conversion_metric__plan0.sql       | 1 +
 .../test_filter_with_conversion_metric__plan0_optimized.sql      | 1 +
 .../Postgres/test_group_by_has_local_entity_prefix__plan0.sql    | 1 +
 .../test_group_by_has_local_entity_prefix__plan0_optimized.sql   | 1 +
 .../SqlQueryPlan/Postgres/test_inner_query_multi_hop__plan0.sql  | 1 +
 .../Postgres/test_inner_query_multi_hop__plan0_optimized.sql     | 1 +
 .../SqlQueryPlan/Postgres/test_inner_query_single_hop__plan0.sql | 1 +
 .../Postgres/test_inner_query_single_hop__plan0_optimized.sql    | 1 +
 .../Postgres/test_metric_filtered_by_itself__plan0.sql           | 1 +
 .../Postgres/test_metric_filtered_by_itself__plan0_optimized.sql | 1 +
 .../Postgres/test_metric_with_metric_in_where_filter__plan0.sql  | 1 +
 .../test_metric_with_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_cumulative_metric_in_where_filter__plan0.sql | 1 +
 ...y_with_cumulative_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_derived_metric_in_where_filter__plan0.sql    | 1 +
 ...uery_with_derived_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_multiple_metrics_in_filter__plan0.sql        | 1 +
 ...st_query_with_multiple_metrics_in_filter__plan0_optimized.sql | 1 +
 .../test_query_with_ratio_metric_in_where_filter__plan0.sql      | 1 +
 ..._query_with_ratio_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_simple_metric_in_where_filter__plan0.sql     | 1 +
 ...query_with_simple_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_distinct_values_query_with_metric_filter__plan0.sql     | 1 +
 ...distinct_values_query_with_metric_filter__plan0_optimized.sql | 1 +
 ...by_metric_in_same_semantic_model_as_queried_metric__plan0.sql | 1 +
 ...in_same_semantic_model_as_queried_metric__plan0_optimized.sql | 1 +
 .../Redshift/test_filter_with_conversion_metric__plan0.sql       | 1 +
 .../test_filter_with_conversion_metric__plan0_optimized.sql      | 1 +
 .../Redshift/test_group_by_has_local_entity_prefix__plan0.sql    | 1 +
 .../test_group_by_has_local_entity_prefix__plan0_optimized.sql   | 1 +
 .../SqlQueryPlan/Redshift/test_inner_query_multi_hop__plan0.sql  | 1 +
 .../Redshift/test_inner_query_multi_hop__plan0_optimized.sql     | 1 +
 .../SqlQueryPlan/Redshift/test_inner_query_single_hop__plan0.sql | 1 +
 .../Redshift/test_inner_query_single_hop__plan0_optimized.sql    | 1 +
 .../Redshift/test_metric_filtered_by_itself__plan0.sql           | 1 +
 .../Redshift/test_metric_filtered_by_itself__plan0_optimized.sql | 1 +
 .../Redshift/test_metric_with_metric_in_where_filter__plan0.sql  | 1 +
 .../test_metric_with_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_cumulative_metric_in_where_filter__plan0.sql | 1 +
 ...y_with_cumulative_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_derived_metric_in_where_filter__plan0.sql    | 1 +
 ...uery_with_derived_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_multiple_metrics_in_filter__plan0.sql        | 1 +
 ...st_query_with_multiple_metrics_in_filter__plan0_optimized.sql | 1 +
 .../test_query_with_ratio_metric_in_where_filter__plan0.sql      | 1 +
 ..._query_with_ratio_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_simple_metric_in_where_filter__plan0.sql     | 1 +
 ...query_with_simple_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_distinct_values_query_with_metric_filter__plan0.sql     | 1 +
 ...distinct_values_query_with_metric_filter__plan0_optimized.sql | 1 +
 ...by_metric_in_same_semantic_model_as_queried_metric__plan0.sql | 1 +
 ...in_same_semantic_model_as_queried_metric__plan0_optimized.sql | 1 +
 .../Snowflake/test_filter_with_conversion_metric__plan0.sql      | 1 +
 .../test_filter_with_conversion_metric__plan0_optimized.sql      | 1 +
 .../Snowflake/test_group_by_has_local_entity_prefix__plan0.sql   | 1 +
 .../test_group_by_has_local_entity_prefix__plan0_optimized.sql   | 1 +
 .../SqlQueryPlan/Snowflake/test_inner_query_multi_hop__plan0.sql | 1 +
 .../Snowflake/test_inner_query_multi_hop__plan0_optimized.sql    | 1 +
 .../Snowflake/test_inner_query_single_hop__plan0.sql             | 1 +
 .../Snowflake/test_inner_query_single_hop__plan0_optimized.sql   | 1 +
 .../Snowflake/test_metric_filtered_by_itself__plan0.sql          | 1 +
 .../test_metric_filtered_by_itself__plan0_optimized.sql          | 1 +
 .../Snowflake/test_metric_with_metric_in_where_filter__plan0.sql | 1 +
 .../test_metric_with_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_cumulative_metric_in_where_filter__plan0.sql | 1 +
 ...y_with_cumulative_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_derived_metric_in_where_filter__plan0.sql    | 1 +
 ...uery_with_derived_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_multiple_metrics_in_filter__plan0.sql        | 1 +
 ...st_query_with_multiple_metrics_in_filter__plan0_optimized.sql | 1 +
 .../test_query_with_ratio_metric_in_where_filter__plan0.sql      | 1 +
 ..._query_with_ratio_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_simple_metric_in_where_filter__plan0.sql     | 1 +
 ...query_with_simple_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_distinct_values_query_with_metric_filter__plan0.sql     | 1 +
 ...distinct_values_query_with_metric_filter__plan0_optimized.sql | 1 +
 ...by_metric_in_same_semantic_model_as_queried_metric__plan0.sql | 1 +
 ...in_same_semantic_model_as_queried_metric__plan0_optimized.sql | 1 +
 .../Trino/test_filter_with_conversion_metric__plan0.sql          | 1 +
 .../test_filter_with_conversion_metric__plan0_optimized.sql      | 1 +
 .../Trino/test_group_by_has_local_entity_prefix__plan0.sql       | 1 +
 .../test_group_by_has_local_entity_prefix__plan0_optimized.sql   | 1 +
 .../SqlQueryPlan/Trino/test_inner_query_multi_hop__plan0.sql     | 1 +
 .../Trino/test_inner_query_multi_hop__plan0_optimized.sql        | 1 +
 .../SqlQueryPlan/Trino/test_inner_query_single_hop__plan0.sql    | 1 +
 .../Trino/test_inner_query_single_hop__plan0_optimized.sql       | 1 +
 .../SqlQueryPlan/Trino/test_metric_filtered_by_itself__plan0.sql | 1 +
 .../Trino/test_metric_filtered_by_itself__plan0_optimized.sql    | 1 +
 .../Trino/test_metric_with_metric_in_where_filter__plan0.sql     | 1 +
 .../test_metric_with_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_cumulative_metric_in_where_filter__plan0.sql | 1 +
 ...y_with_cumulative_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_derived_metric_in_where_filter__plan0.sql    | 1 +
 ...uery_with_derived_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../Trino/test_query_with_multiple_metrics_in_filter__plan0.sql  | 1 +
 ...st_query_with_multiple_metrics_in_filter__plan0_optimized.sql | 1 +
 .../test_query_with_ratio_metric_in_where_filter__plan0.sql      | 1 +
 ..._query_with_ratio_metric_in_where_filter__plan0_optimized.sql | 1 +
 .../test_query_with_simple_metric_in_where_filter__plan0.sql     | 1 +
 ...query_with_simple_metric_in_where_filter__plan0_optimized.sql | 1 +
 ...me_dimension_transform_node_using_non_primary_time__plan0.sql | 1 +
 ...on_transform_node_using_non_primary_time__plan0_optimized.sql | 1 +
 ...c_time_dimension_transform_node_using_primary_time__plan0.sql | 1 +
 ...ension_transform_node_using_primary_time__plan0_optimized.sql | 1 +
 .../test_simple_query_with_metric_time_dimension__plan0.sql      | 1 +
 ..._simple_query_with_metric_time_dimension__plan0_optimized.sql | 1 +
 ...me_dimension_transform_node_using_non_primary_time__plan0.sql | 1 +
 ...on_transform_node_using_non_primary_time__plan0_optimized.sql | 1 +
 ...c_time_dimension_transform_node_using_primary_time__plan0.sql | 1 +
 ...ension_transform_node_using_primary_time__plan0_optimized.sql | 1 +
 .../test_simple_query_with_metric_time_dimension__plan0.sql      | 1 +
 ..._simple_query_with_metric_time_dimension__plan0_optimized.sql | 1 +
 ...me_dimension_transform_node_using_non_primary_time__plan0.sql | 1 +
 ...on_transform_node_using_non_primary_time__plan0_optimized.sql | 1 +
 ...c_time_dimension_transform_node_using_primary_time__plan0.sql | 1 +
 ...ension_transform_node_using_primary_time__plan0_optimized.sql | 1 +
 .../test_simple_query_with_metric_time_dimension__plan0.sql      | 1 +
 ..._simple_query_with_metric_time_dimension__plan0_optimized.sql | 1 +
 ...me_dimension_transform_node_using_non_primary_time__plan0.sql | 1 +
 ...on_transform_node_using_non_primary_time__plan0_optimized.sql | 1 +
 ...c_time_dimension_transform_node_using_primary_time__plan0.sql | 1 +
 ...ension_transform_node_using_primary_time__plan0_optimized.sql | 1 +
 .../test_simple_query_with_metric_time_dimension__plan0.sql      | 1 +
 ..._simple_query_with_metric_time_dimension__plan0_optimized.sql | 1 +
 ...me_dimension_transform_node_using_non_primary_time__plan0.sql | 1 +
 ...on_transform_node_using_non_primary_time__plan0_optimized.sql | 1 +
 ...c_time_dimension_transform_node_using_primary_time__plan0.sql | 1 +
 ...ension_transform_node_using_primary_time__plan0_optimized.sql | 1 +
 .../test_simple_query_with_metric_time_dimension__plan0.sql      | 1 +
 ..._simple_query_with_metric_time_dimension__plan0_optimized.sql | 1 +
 ...me_dimension_transform_node_using_non_primary_time__plan0.sql | 1 +
 ...on_transform_node_using_non_primary_time__plan0_optimized.sql | 1 +
 ...c_time_dimension_transform_node_using_primary_time__plan0.sql | 1 +
 ...ension_transform_node_using_primary_time__plan0_optimized.sql | 1 +
 .../test_simple_query_with_metric_time_dimension__plan0.sql      | 1 +
 ..._simple_query_with_metric_time_dimension__plan0_optimized.sql | 1 +
 ...me_dimension_transform_node_using_non_primary_time__plan0.sql | 1 +
 ...on_transform_node_using_non_primary_time__plan0_optimized.sql | 1 +
 ...c_time_dimension_transform_node_using_primary_time__plan0.sql | 1 +
 ...ension_transform_node_using_primary_time__plan0_optimized.sql | 1 +
 .../test_simple_query_with_metric_time_dimension__plan0.sql      | 1 +
 ..._simple_query_with_metric_time_dimension__plan0_optimized.sql | 1 +
 .../BigQuery/test_dimensions_with_time_constraint__plan0.sql     | 1 +
 .../test_dimensions_with_time_constraint__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/BigQuery/test_metric_time_only__plan0.sql       | 1 +
 .../BigQuery/test_metric_time_only__plan0_optimized.sql          | 1 +
 .../BigQuery/test_metric_time_quarter_alone__plan0.sql           | 1 +
 .../BigQuery/test_metric_time_quarter_alone__plan0_optimized.sql | 1 +
 .../BigQuery/test_metric_time_with_other_dimensions__plan0.sql   | 1 +
 .../test_metric_time_with_other_dimensions__plan0_optimized.sql  | 1 +
 .../Databricks/test_dimensions_with_time_constraint__plan0.sql   | 1 +
 .../test_dimensions_with_time_constraint__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/Databricks/test_metric_time_only__plan0.sql     | 1 +
 .../Databricks/test_metric_time_only__plan0_optimized.sql        | 1 +
 .../Databricks/test_metric_time_quarter_alone__plan0.sql         | 1 +
 .../test_metric_time_quarter_alone__plan0_optimized.sql          | 1 +
 .../Databricks/test_metric_time_with_other_dimensions__plan0.sql | 1 +
 .../test_metric_time_with_other_dimensions__plan0_optimized.sql  | 1 +
 .../DuckDB/test_dimensions_with_time_constraint__plan0.sql       | 1 +
 .../test_dimensions_with_time_constraint__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/DuckDB/test_metric_time_only__plan0.sql         | 1 +
 .../DuckDB/test_metric_time_only__plan0_optimized.sql            | 1 +
 .../DuckDB/test_metric_time_quarter_alone__plan0.sql             | 1 +
 .../DuckDB/test_metric_time_quarter_alone__plan0_optimized.sql   | 1 +
 .../DuckDB/test_metric_time_with_other_dimensions__plan0.sql     | 1 +
 .../test_metric_time_with_other_dimensions__plan0_optimized.sql  | 1 +
 .../Postgres/test_dimensions_with_time_constraint__plan0.sql     | 1 +
 .../test_dimensions_with_time_constraint__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/Postgres/test_metric_time_only__plan0.sql       | 1 +
 .../Postgres/test_metric_time_only__plan0_optimized.sql          | 1 +
 .../Postgres/test_metric_time_quarter_alone__plan0.sql           | 1 +
 .../Postgres/test_metric_time_quarter_alone__plan0_optimized.sql | 1 +
 .../Postgres/test_metric_time_with_other_dimensions__plan0.sql   | 1 +
 .../test_metric_time_with_other_dimensions__plan0_optimized.sql  | 1 +
 .../Redshift/test_dimensions_with_time_constraint__plan0.sql     | 1 +
 .../test_dimensions_with_time_constraint__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/Redshift/test_metric_time_only__plan0.sql       | 1 +
 .../Redshift/test_metric_time_only__plan0_optimized.sql          | 1 +
 .../Redshift/test_metric_time_quarter_alone__plan0.sql           | 1 +
 .../Redshift/test_metric_time_quarter_alone__plan0_optimized.sql | 1 +
 .../Redshift/test_metric_time_with_other_dimensions__plan0.sql   | 1 +
 .../test_metric_time_with_other_dimensions__plan0_optimized.sql  | 1 +
 .../Snowflake/test_dimensions_with_time_constraint__plan0.sql    | 1 +
 .../test_dimensions_with_time_constraint__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/Snowflake/test_metric_time_only__plan0.sql      | 1 +
 .../Snowflake/test_metric_time_only__plan0_optimized.sql         | 1 +
 .../Snowflake/test_metric_time_quarter_alone__plan0.sql          | 1 +
 .../test_metric_time_quarter_alone__plan0_optimized.sql          | 1 +
 .../Snowflake/test_metric_time_with_other_dimensions__plan0.sql  | 1 +
 .../test_metric_time_with_other_dimensions__plan0_optimized.sql  | 1 +
 .../Trino/test_dimensions_with_time_constraint__plan0.sql        | 1 +
 .../test_dimensions_with_time_constraint__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/Trino/test_metric_time_only__plan0.sql          | 1 +
 .../Trino/test_metric_time_only__plan0_optimized.sql             | 1 +
 .../SqlQueryPlan/Trino/test_metric_time_quarter_alone__plan0.sql | 1 +
 .../Trino/test_metric_time_quarter_alone__plan0_optimized.sql    | 1 +
 .../Trino/test_metric_time_with_other_dimensions__plan0.sql      | 1 +
 .../test_metric_time_with_other_dimensions__plan0_optimized.sql  | 1 +
 .../BigQuery/test_conversion_metric_query_filters__plan0.sql     | 1 +
 .../test_conversion_metric_query_filters__plan0_optimized.sql    | 1 +
 .../test_cumulative_metric_with_query_time_filters__plan0.sql    | 1 +
 ...umulative_metric_with_query_time_filters__plan0_optimized.sql | 1 +
 ...lters_on_same_measure_source_categorical_dimension__plan0.sql | 1 +
 ...ame_measure_source_categorical_dimension__plan0_optimized.sql | 1 +
 ...st_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql | 1 +
 ...lls_time_spine_metric_predicate_pushdown__plan0_optimized.sql | 1 +
 .../BigQuery/test_metric_time_filter_with_two_targets__plan0.sql | 1 +
 ...test_metric_time_filter_with_two_targets__plan0_optimized.sql | 1 +
 .../test_multiple_categorical_dimension_pushdown__plan0.sql      | 1 +
 ..._multiple_categorical_dimension_pushdown__plan0_optimized.sql | 1 +
 .../test_offset_metric_with_query_time_filters__plan0.sql        | 1 +
 ...st_offset_metric_with_query_time_filters__plan0_optimized.sql | 1 +
 .../test_saved_query_with_metric_joins_and_filter__plan0.sql     | 1 +
 ...saved_query_with_metric_joins_and_filter__plan0_optimized.sql | 1 +
 ...ple_join_to_time_spine_pushdown_filter_application__plan0.sql | 1 +
 ...o_time_spine_pushdown_filter_application__plan0_optimized.sql | 1 +
 .../test_single_categorical_dimension_pushdown__plan0.sql        | 1 +
 ...st_single_categorical_dimension_pushdown__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/BigQuery/test_skipped_pushdown__plan0.sql       | 1 +
 .../BigQuery/test_skipped_pushdown__plan0_optimized.sql          | 1 +
 .../Databricks/test_conversion_metric_query_filters__plan0.sql   | 1 +
 .../test_conversion_metric_query_filters__plan0_optimized.sql    | 1 +
 .../test_cumulative_metric_with_query_time_filters__plan0.sql    | 1 +
 ...umulative_metric_with_query_time_filters__plan0_optimized.sql | 1 +
 ...lters_on_same_measure_source_categorical_dimension__plan0.sql | 1 +
 ...ame_measure_source_categorical_dimension__plan0_optimized.sql | 1 +
 ...st_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql | 1 +
 ...lls_time_spine_metric_predicate_pushdown__plan0_optimized.sql | 1 +
 .../test_metric_time_filter_with_two_targets__plan0.sql          | 1 +
 ...test_metric_time_filter_with_two_targets__plan0_optimized.sql | 1 +
 .../test_multiple_categorical_dimension_pushdown__plan0.sql      | 1 +
 ..._multiple_categorical_dimension_pushdown__plan0_optimized.sql | 1 +
 .../test_offset_metric_with_query_time_filters__plan0.sql        | 1 +
 ...st_offset_metric_with_query_time_filters__plan0_optimized.sql | 1 +
 .../test_saved_query_with_metric_joins_and_filter__plan0.sql     | 1 +
 ...saved_query_with_metric_joins_and_filter__plan0_optimized.sql | 1 +
 ...ple_join_to_time_spine_pushdown_filter_application__plan0.sql | 1 +
 ...o_time_spine_pushdown_filter_application__plan0_optimized.sql | 1 +
 .../test_single_categorical_dimension_pushdown__plan0.sql        | 1 +
 ...st_single_categorical_dimension_pushdown__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Databricks/test_skipped_pushdown__plan0.sql     | 1 +
 .../Databricks/test_skipped_pushdown__plan0_optimized.sql        | 1 +
 .../DuckDB/test_conversion_metric_query_filters__plan0.sql       | 1 +
 .../test_conversion_metric_query_filters__plan0_optimized.sql    | 1 +
 .../test_cumulative_metric_with_query_time_filters__plan0.sql    | 1 +
 ...umulative_metric_with_query_time_filters__plan0_optimized.sql | 1 +
 ...lters_on_same_measure_source_categorical_dimension__plan0.sql | 1 +
 ...ame_measure_source_categorical_dimension__plan0_optimized.sql | 1 +
 ...st_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql | 1 +
 ...lls_time_spine_metric_predicate_pushdown__plan0_optimized.sql | 1 +
 .../DuckDB/test_metric_time_filter_with_two_targets__plan0.sql   | 1 +
 ...test_metric_time_filter_with_two_targets__plan0_optimized.sql | 1 +
 .../test_multiple_categorical_dimension_pushdown__plan0.sql      | 1 +
 ..._multiple_categorical_dimension_pushdown__plan0_optimized.sql | 1 +
 .../DuckDB/test_offset_metric_with_query_time_filters__plan0.sql | 1 +
 ...st_offset_metric_with_query_time_filters__plan0_optimized.sql | 1 +
 .../test_saved_query_with_metric_joins_and_filter__plan0.sql     | 1 +
 ...saved_query_with_metric_joins_and_filter__plan0_optimized.sql | 1 +
 ...ple_join_to_time_spine_pushdown_filter_application__plan0.sql | 1 +
 ...o_time_spine_pushdown_filter_application__plan0_optimized.sql | 1 +
 .../DuckDB/test_single_categorical_dimension_pushdown__plan0.sql | 1 +
 ...st_single_categorical_dimension_pushdown__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/DuckDB/test_skipped_pushdown__plan0.sql         | 1 +
 .../DuckDB/test_skipped_pushdown__plan0_optimized.sql            | 1 +
 .../Postgres/test_conversion_metric_query_filters__plan0.sql     | 1 +
 .../test_conversion_metric_query_filters__plan0_optimized.sql    | 1 +
 .../test_cumulative_metric_with_query_time_filters__plan0.sql    | 1 +
 ...umulative_metric_with_query_time_filters__plan0_optimized.sql | 1 +
 ...lters_on_same_measure_source_categorical_dimension__plan0.sql | 1 +
 ...ame_measure_source_categorical_dimension__plan0_optimized.sql | 1 +
 ...st_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql | 1 +
 ...lls_time_spine_metric_predicate_pushdown__plan0_optimized.sql | 1 +
 .../Postgres/test_metric_time_filter_with_two_targets__plan0.sql | 1 +
 ...test_metric_time_filter_with_two_targets__plan0_optimized.sql | 1 +
 .../test_multiple_categorical_dimension_pushdown__plan0.sql      | 1 +
 ..._multiple_categorical_dimension_pushdown__plan0_optimized.sql | 1 +
 .../test_offset_metric_with_query_time_filters__plan0.sql        | 1 +
 ...st_offset_metric_with_query_time_filters__plan0_optimized.sql | 1 +
 .../test_saved_query_with_metric_joins_and_filter__plan0.sql     | 1 +
 ...saved_query_with_metric_joins_and_filter__plan0_optimized.sql | 1 +
 ...ple_join_to_time_spine_pushdown_filter_application__plan0.sql | 1 +
 ...o_time_spine_pushdown_filter_application__plan0_optimized.sql | 1 +
 .../test_single_categorical_dimension_pushdown__plan0.sql        | 1 +
 ...st_single_categorical_dimension_pushdown__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Postgres/test_skipped_pushdown__plan0.sql       | 1 +
 .../Postgres/test_skipped_pushdown__plan0_optimized.sql          | 1 +
 .../Redshift/test_conversion_metric_query_filters__plan0.sql     | 1 +
 .../test_conversion_metric_query_filters__plan0_optimized.sql    | 1 +
 .../test_cumulative_metric_with_query_time_filters__plan0.sql    | 1 +
 ...umulative_metric_with_query_time_filters__plan0_optimized.sql | 1 +
 ...lters_on_same_measure_source_categorical_dimension__plan0.sql | 1 +
 ...ame_measure_source_categorical_dimension__plan0_optimized.sql | 1 +
 ...st_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql | 1 +
 ...lls_time_spine_metric_predicate_pushdown__plan0_optimized.sql | 1 +
 .../Redshift/test_metric_time_filter_with_two_targets__plan0.sql | 1 +
 ...test_metric_time_filter_with_two_targets__plan0_optimized.sql | 1 +
 .../test_multiple_categorical_dimension_pushdown__plan0.sql      | 1 +
 ..._multiple_categorical_dimension_pushdown__plan0_optimized.sql | 1 +
 .../test_offset_metric_with_query_time_filters__plan0.sql        | 1 +
 ...st_offset_metric_with_query_time_filters__plan0_optimized.sql | 1 +
 .../test_saved_query_with_metric_joins_and_filter__plan0.sql     | 1 +
 ...saved_query_with_metric_joins_and_filter__plan0_optimized.sql | 1 +
 ...ple_join_to_time_spine_pushdown_filter_application__plan0.sql | 1 +
 ...o_time_spine_pushdown_filter_application__plan0_optimized.sql | 1 +
 .../test_single_categorical_dimension_pushdown__plan0.sql        | 1 +
 ...st_single_categorical_dimension_pushdown__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Redshift/test_skipped_pushdown__plan0.sql       | 1 +
 .../Redshift/test_skipped_pushdown__plan0_optimized.sql          | 1 +
 .../Snowflake/test_conversion_metric_query_filters__plan0.sql    | 1 +
 .../test_conversion_metric_query_filters__plan0_optimized.sql    | 1 +
 .../test_cumulative_metric_with_query_time_filters__plan0.sql    | 1 +
 ...umulative_metric_with_query_time_filters__plan0_optimized.sql | 1 +
 ...lters_on_same_measure_source_categorical_dimension__plan0.sql | 1 +
 ...ame_measure_source_categorical_dimension__plan0_optimized.sql | 1 +
 ...st_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql | 1 +
 ...lls_time_spine_metric_predicate_pushdown__plan0_optimized.sql | 1 +
 .../test_metric_time_filter_with_two_targets__plan0.sql          | 1 +
 ...test_metric_time_filter_with_two_targets__plan0_optimized.sql | 1 +
 .../test_multiple_categorical_dimension_pushdown__plan0.sql      | 1 +
 ..._multiple_categorical_dimension_pushdown__plan0_optimized.sql | 1 +
 .../test_offset_metric_with_query_time_filters__plan0.sql        | 1 +
 ...st_offset_metric_with_query_time_filters__plan0_optimized.sql | 1 +
 .../test_saved_query_with_metric_joins_and_filter__plan0.sql     | 1 +
 ...saved_query_with_metric_joins_and_filter__plan0_optimized.sql | 1 +
 ...ple_join_to_time_spine_pushdown_filter_application__plan0.sql | 1 +
 ...o_time_spine_pushdown_filter_application__plan0_optimized.sql | 1 +
 .../test_single_categorical_dimension_pushdown__plan0.sql        | 1 +
 ...st_single_categorical_dimension_pushdown__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Snowflake/test_skipped_pushdown__plan0.sql      | 1 +
 .../Snowflake/test_skipped_pushdown__plan0_optimized.sql         | 1 +
 .../Trino/test_conversion_metric_query_filters__plan0.sql        | 1 +
 .../test_conversion_metric_query_filters__plan0_optimized.sql    | 1 +
 .../test_cumulative_metric_with_query_time_filters__plan0.sql    | 1 +
 ...umulative_metric_with_query_time_filters__plan0_optimized.sql | 1 +
 ...lters_on_same_measure_source_categorical_dimension__plan0.sql | 1 +
 ...ame_measure_source_categorical_dimension__plan0_optimized.sql | 1 +
 ...st_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql | 1 +
 ...lls_time_spine_metric_predicate_pushdown__plan0_optimized.sql | 1 +
 .../Trino/test_metric_time_filter_with_two_targets__plan0.sql    | 1 +
 ...test_metric_time_filter_with_two_targets__plan0_optimized.sql | 1 +
 .../test_multiple_categorical_dimension_pushdown__plan0.sql      | 1 +
 ..._multiple_categorical_dimension_pushdown__plan0_optimized.sql | 1 +
 .../Trino/test_offset_metric_with_query_time_filters__plan0.sql  | 1 +
 ...st_offset_metric_with_query_time_filters__plan0_optimized.sql | 1 +
 .../test_saved_query_with_metric_joins_and_filter__plan0.sql     | 1 +
 ...saved_query_with_metric_joins_and_filter__plan0_optimized.sql | 1 +
 ...ple_join_to_time_spine_pushdown_filter_application__plan0.sql | 1 +
 ...o_time_spine_pushdown_filter_application__plan0_optimized.sql | 1 +
 .../Trino/test_single_categorical_dimension_pushdown__plan0.sql  | 1 +
 ...st_single_categorical_dimension_pushdown__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_skipped_pushdown__plan0.sql          | 1 +
 .../Trino/test_skipped_pushdown__plan0_optimized.sql             | 1 +
 .../SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql  | 1 +
 .../BigQuery/test_common_semantic_model__plan0_optimized.sql     | 1 +
 .../SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql        | 1 +
 .../BigQuery/test_distinct_values__plan0_optimized.sql           | 1 +
 .../test_filter_with_where_constraint_on_join_dim__plan0.sql     | 1 +
 ...filter_with_where_constraint_on_join_dim__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql  | 1 +
 .../BigQuery/test_join_to_scd_dimension__plan0_optimized.sql     | 1 +
 .../SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql             | 1 +
 .../SqlQueryPlan/BigQuery/test_limit_rows__plan0_optimized.sql   | 1 +
 .../BigQuery/test_local_dimension_using_local_entity__plan0.sql  | 1 +
 .../test_local_dimension_using_local_entity__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql     | 1 +
 .../BigQuery/test_measure_constraint__plan0_optimized.sql        | 1 +
 .../test_measure_constraint_with_reused_measure__plan0.sql       | 1 +
 ...t_measure_constraint_with_reused_measure__plan0_optimized.sql | 1 +
 ...test_measure_constraint_with_single_expr_and_alias__plan0.sql | 1 +
 ...re_constraint_with_single_expr_and_alias__plan0_optimized.sql | 1 +
 ..._with_measures_from_multiple_sources_no_dimensions__plan0.sql | 1 +
 ...ures_from_multiple_sources_no_dimensions__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/BigQuery/test_min_max_metric_time__plan0.sql    | 1 +
 .../BigQuery/test_min_max_metric_time__plan0_optimized.sql       | 1 +
 .../BigQuery/test_min_max_metric_time_week__plan0.sql            | 1 +
 .../BigQuery/test_min_max_metric_time_week__plan0_optimized.sql  | 1 +
 .../BigQuery/test_min_max_only_categorical__plan0.sql            | 1 +
 .../BigQuery/test_min_max_only_categorical__plan0_optimized.sql  | 1 +
 .../SqlQueryPlan/BigQuery/test_min_max_only_time__plan0.sql      | 1 +
 .../BigQuery/test_min_max_only_time__plan0_optimized.sql         | 1 +
 .../BigQuery/test_min_max_only_time_quarter__plan0.sql           | 1 +
 .../BigQuery/test_min_max_only_time_quarter__plan0_optimized.sql | 1 +
 .../BigQuery/test_multi_hop_through_scd_dimension__plan0.sql     | 1 +
 .../test_multi_hop_through_scd_dimension__plan0_optimized.sql    | 1 +
 .../BigQuery/test_multi_hop_to_scd_dimension__plan0.sql          | 1 +
 .../test_multi_hop_to_scd_dimension__plan0_optimized.sql         | 1 +
 .../SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql          | 1 +
 .../BigQuery/test_multihop_node__plan0_optimized.sql             | 1 +
 .../BigQuery/test_multiple_metrics_no_dimensions__plan0.sql      | 1 +
 .../test_multiple_metrics_no_dimensions__plan0_optimized.sql     | 1 +
 ...test_non_additive_dimension_with_non_default_grain__plan0.sql | 1 +
 ...dditive_dimension_with_non_default_grain__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql       | 1 +
 .../BigQuery/test_partitioned_join__plan0_optimized.sql          | 1 +
 .../Databricks/test_common_semantic_model__plan0.sql             | 1 +
 .../Databricks/test_common_semantic_model__plan0_optimized.sql   | 1 +
 .../SqlQueryPlan/Databricks/test_distinct_values__plan0.sql      | 1 +
 .../Databricks/test_distinct_values__plan0_optimized.sql         | 1 +
 .../test_filter_with_where_constraint_on_join_dim__plan0.sql     | 1 +
 ...filter_with_where_constraint_on_join_dim__plan0_optimized.sql | 1 +
 .../Databricks/test_join_to_scd_dimension__plan0.sql             | 1 +
 .../Databricks/test_join_to_scd_dimension__plan0_optimized.sql   | 1 +
 .../SqlQueryPlan/Databricks/test_limit_rows__plan0.sql           | 1 +
 .../SqlQueryPlan/Databricks/test_limit_rows__plan0_optimized.sql | 1 +
 .../test_local_dimension_using_local_entity__plan0.sql           | 1 +
 .../test_local_dimension_using_local_entity__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql   | 1 +
 .../Databricks/test_measure_constraint__plan0_optimized.sql      | 1 +
 .../test_measure_constraint_with_reused_measure__plan0.sql       | 1 +
 ...t_measure_constraint_with_reused_measure__plan0_optimized.sql | 1 +
 ...test_measure_constraint_with_single_expr_and_alias__plan0.sql | 1 +
 ...re_constraint_with_single_expr_and_alias__plan0_optimized.sql | 1 +
 ..._with_measures_from_multiple_sources_no_dimensions__plan0.sql | 1 +
 ...ures_from_multiple_sources_no_dimensions__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Databricks/test_min_max_metric_time__plan0.sql  | 1 +
 .../Databricks/test_min_max_metric_time__plan0_optimized.sql     | 1 +
 .../Databricks/test_min_max_metric_time_week__plan0.sql          | 1 +
 .../test_min_max_metric_time_week__plan0_optimized.sql           | 1 +
 .../Databricks/test_min_max_only_categorical__plan0.sql          | 1 +
 .../test_min_max_only_categorical__plan0_optimized.sql           | 1 +
 .../SqlQueryPlan/Databricks/test_min_max_only_time__plan0.sql    | 1 +
 .../Databricks/test_min_max_only_time__plan0_optimized.sql       | 1 +
 .../Databricks/test_min_max_only_time_quarter__plan0.sql         | 1 +
 .../test_min_max_only_time_quarter__plan0_optimized.sql          | 1 +
 .../Databricks/test_multi_hop_through_scd_dimension__plan0.sql   | 1 +
 .../test_multi_hop_through_scd_dimension__plan0_optimized.sql    | 1 +
 .../Databricks/test_multi_hop_to_scd_dimension__plan0.sql        | 1 +
 .../test_multi_hop_to_scd_dimension__plan0_optimized.sql         | 1 +
 .../SqlQueryPlan/Databricks/test_multihop_node__plan0.sql        | 1 +
 .../Databricks/test_multihop_node__plan0_optimized.sql           | 1 +
 .../Databricks/test_multiple_metrics_no_dimensions__plan0.sql    | 1 +
 .../test_multiple_metrics_no_dimensions__plan0_optimized.sql     | 1 +
 ...test_non_additive_dimension_with_non_default_grain__plan0.sql | 1 +
 ...dditive_dimension_with_non_default_grain__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql     | 1 +
 .../Databricks/test_partitioned_join__plan0_optimized.sql        | 1 +
 .../SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql    | 1 +
 .../DuckDB/test_common_semantic_model__plan0_optimized.sql       | 1 +
 .../SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql          | 1 +
 .../DuckDB/test_distinct_values__plan0_optimized.sql             | 1 +
 .../test_filter_with_where_constraint_on_join_dim__plan0.sql     | 1 +
 ...filter_with_where_constraint_on_join_dim__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql    | 1 +
 .../DuckDB/test_join_to_scd_dimension__plan0_optimized.sql       | 1 +
 .../SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql               | 1 +
 .../SqlQueryPlan/DuckDB/test_limit_rows__plan0_optimized.sql     | 1 +
 .../DuckDB/test_local_dimension_using_local_entity__plan0.sql    | 1 +
 .../test_local_dimension_using_local_entity__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql       | 1 +
 .../DuckDB/test_measure_constraint__plan0_optimized.sql          | 1 +
 .../test_measure_constraint_with_reused_measure__plan0.sql       | 1 +
 ...t_measure_constraint_with_reused_measure__plan0_optimized.sql | 1 +
 ...test_measure_constraint_with_single_expr_and_alias__plan0.sql | 1 +
 ...re_constraint_with_single_expr_and_alias__plan0_optimized.sql | 1 +
 ..._with_measures_from_multiple_sources_no_dimensions__plan0.sql | 1 +
 ...ures_from_multiple_sources_no_dimensions__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/DuckDB/test_min_max_metric_time__plan0.sql      | 1 +
 .../DuckDB/test_min_max_metric_time__plan0_optimized.sql         | 1 +
 .../SqlQueryPlan/DuckDB/test_min_max_metric_time_week__plan0.sql | 1 +
 .../DuckDB/test_min_max_metric_time_week__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/DuckDB/test_min_max_only_categorical__plan0.sql | 1 +
 .../DuckDB/test_min_max_only_categorical__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/DuckDB/test_min_max_only_time__plan0.sql        | 1 +
 .../DuckDB/test_min_max_only_time__plan0_optimized.sql           | 1 +
 .../DuckDB/test_min_max_only_time_quarter__plan0.sql             | 1 +
 .../DuckDB/test_min_max_only_time_quarter__plan0_optimized.sql   | 1 +
 .../DuckDB/test_multi_hop_through_scd_dimension__plan0.sql       | 1 +
 .../test_multi_hop_through_scd_dimension__plan0_optimized.sql    | 1 +
 .../DuckDB/test_multi_hop_to_scd_dimension__plan0.sql            | 1 +
 .../DuckDB/test_multi_hop_to_scd_dimension__plan0_optimized.sql  | 1 +
 .../SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql            | 1 +
 .../SqlQueryPlan/DuckDB/test_multihop_node__plan0_optimized.sql  | 1 +
 .../DuckDB/test_multiple_metrics_no_dimensions__plan0.sql        | 1 +
 .../test_multiple_metrics_no_dimensions__plan0_optimized.sql     | 1 +
 ...test_non_additive_dimension_with_non_default_grain__plan0.sql | 1 +
 ...dditive_dimension_with_non_default_grain__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql         | 1 +
 .../DuckDB/test_partitioned_join__plan0_optimized.sql            | 1 +
 .../SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql  | 1 +
 .../Postgres/test_common_semantic_model__plan0_optimized.sql     | 1 +
 .../SqlQueryPlan/Postgres/test_distinct_values__plan0.sql        | 1 +
 .../Postgres/test_distinct_values__plan0_optimized.sql           | 1 +
 .../test_filter_with_where_constraint_on_join_dim__plan0.sql     | 1 +
 ...filter_with_where_constraint_on_join_dim__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql  | 1 +
 .../Postgres/test_join_to_scd_dimension__plan0_optimized.sql     | 1 +
 .../SqlQueryPlan/Postgres/test_limit_rows__plan0.sql             | 1 +
 .../SqlQueryPlan/Postgres/test_limit_rows__plan0_optimized.sql   | 1 +
 .../Postgres/test_local_dimension_using_local_entity__plan0.sql  | 1 +
 .../test_local_dimension_using_local_entity__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql     | 1 +
 .../Postgres/test_measure_constraint__plan0_optimized.sql        | 1 +
 .../test_measure_constraint_with_reused_measure__plan0.sql       | 1 +
 ...t_measure_constraint_with_reused_measure__plan0_optimized.sql | 1 +
 ...test_measure_constraint_with_single_expr_and_alias__plan0.sql | 1 +
 ...re_constraint_with_single_expr_and_alias__plan0_optimized.sql | 1 +
 ..._with_measures_from_multiple_sources_no_dimensions__plan0.sql | 1 +
 ...ures_from_multiple_sources_no_dimensions__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Postgres/test_min_max_metric_time__plan0.sql    | 1 +
 .../Postgres/test_min_max_metric_time__plan0_optimized.sql       | 1 +
 .../Postgres/test_min_max_metric_time_week__plan0.sql            | 1 +
 .../Postgres/test_min_max_metric_time_week__plan0_optimized.sql  | 1 +
 .../Postgres/test_min_max_only_categorical__plan0.sql            | 1 +
 .../Postgres/test_min_max_only_categorical__plan0_optimized.sql  | 1 +
 .../SqlQueryPlan/Postgres/test_min_max_only_time__plan0.sql      | 1 +
 .../Postgres/test_min_max_only_time__plan0_optimized.sql         | 1 +
 .../Postgres/test_min_max_only_time_quarter__plan0.sql           | 1 +
 .../Postgres/test_min_max_only_time_quarter__plan0_optimized.sql | 1 +
 .../Postgres/test_multi_hop_through_scd_dimension__plan0.sql     | 1 +
 .../test_multi_hop_through_scd_dimension__plan0_optimized.sql    | 1 +
 .../Postgres/test_multi_hop_to_scd_dimension__plan0.sql          | 1 +
 .../test_multi_hop_to_scd_dimension__plan0_optimized.sql         | 1 +
 .../SqlQueryPlan/Postgres/test_multihop_node__plan0.sql          | 1 +
 .../Postgres/test_multihop_node__plan0_optimized.sql             | 1 +
 .../Postgres/test_multiple_metrics_no_dimensions__plan0.sql      | 1 +
 .../test_multiple_metrics_no_dimensions__plan0_optimized.sql     | 1 +
 ...test_non_additive_dimension_with_non_default_grain__plan0.sql | 1 +
 ...dditive_dimension_with_non_default_grain__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql       | 1 +
 .../Postgres/test_partitioned_join__plan0_optimized.sql          | 1 +
 .../SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql  | 1 +
 .../Redshift/test_common_semantic_model__plan0_optimized.sql     | 1 +
 .../SqlQueryPlan/Redshift/test_distinct_values__plan0.sql        | 1 +
 .../Redshift/test_distinct_values__plan0_optimized.sql           | 1 +
 .../test_filter_with_where_constraint_on_join_dim__plan0.sql     | 1 +
 ...filter_with_where_constraint_on_join_dim__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql  | 1 +
 .../Redshift/test_join_to_scd_dimension__plan0_optimized.sql     | 1 +
 .../SqlQueryPlan/Redshift/test_limit_rows__plan0.sql             | 1 +
 .../SqlQueryPlan/Redshift/test_limit_rows__plan0_optimized.sql   | 1 +
 .../Redshift/test_local_dimension_using_local_entity__plan0.sql  | 1 +
 .../test_local_dimension_using_local_entity__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql     | 1 +
 .../Redshift/test_measure_constraint__plan0_optimized.sql        | 1 +
 .../test_measure_constraint_with_reused_measure__plan0.sql       | 1 +
 ...t_measure_constraint_with_reused_measure__plan0_optimized.sql | 1 +
 ...test_measure_constraint_with_single_expr_and_alias__plan0.sql | 1 +
 ...re_constraint_with_single_expr_and_alias__plan0_optimized.sql | 1 +
 ..._with_measures_from_multiple_sources_no_dimensions__plan0.sql | 1 +
 ...ures_from_multiple_sources_no_dimensions__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Redshift/test_min_max_metric_time__plan0.sql    | 1 +
 .../Redshift/test_min_max_metric_time__plan0_optimized.sql       | 1 +
 .../Redshift/test_min_max_metric_time_week__plan0.sql            | 1 +
 .../Redshift/test_min_max_metric_time_week__plan0_optimized.sql  | 1 +
 .../Redshift/test_min_max_only_categorical__plan0.sql            | 1 +
 .../Redshift/test_min_max_only_categorical__plan0_optimized.sql  | 1 +
 .../SqlQueryPlan/Redshift/test_min_max_only_time__plan0.sql      | 1 +
 .../Redshift/test_min_max_only_time__plan0_optimized.sql         | 1 +
 .../Redshift/test_min_max_only_time_quarter__plan0.sql           | 1 +
 .../Redshift/test_min_max_only_time_quarter__plan0_optimized.sql | 1 +
 .../Redshift/test_multi_hop_through_scd_dimension__plan0.sql     | 1 +
 .../test_multi_hop_through_scd_dimension__plan0_optimized.sql    | 1 +
 .../Redshift/test_multi_hop_to_scd_dimension__plan0.sql          | 1 +
 .../test_multi_hop_to_scd_dimension__plan0_optimized.sql         | 1 +
 .../SqlQueryPlan/Redshift/test_multihop_node__plan0.sql          | 1 +
 .../Redshift/test_multihop_node__plan0_optimized.sql             | 1 +
 .../Redshift/test_multiple_metrics_no_dimensions__plan0.sql      | 1 +
 .../test_multiple_metrics_no_dimensions__plan0_optimized.sql     | 1 +
 ...test_non_additive_dimension_with_non_default_grain__plan0.sql | 1 +
 ...dditive_dimension_with_non_default_grain__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql       | 1 +
 .../Redshift/test_partitioned_join__plan0_optimized.sql          | 1 +
 .../SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql | 1 +
 .../Snowflake/test_common_semantic_model__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql       | 1 +
 .../Snowflake/test_distinct_values__plan0_optimized.sql          | 1 +
 .../test_filter_with_where_constraint_on_join_dim__plan0.sql     | 1 +
 ...filter_with_where_constraint_on_join_dim__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql | 1 +
 .../Snowflake/test_join_to_scd_dimension__plan0_optimized.sql    | 1 +
 .../SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql            | 1 +
 .../SqlQueryPlan/Snowflake/test_limit_rows__plan0_optimized.sql  | 1 +
 .../Snowflake/test_local_dimension_using_local_entity__plan0.sql | 1 +
 .../test_local_dimension_using_local_entity__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql    | 1 +
 .../Snowflake/test_measure_constraint__plan0_optimized.sql       | 1 +
 .../test_measure_constraint_with_reused_measure__plan0.sql       | 1 +
 ...t_measure_constraint_with_reused_measure__plan0_optimized.sql | 1 +
 ...test_measure_constraint_with_single_expr_and_alias__plan0.sql | 1 +
 ...re_constraint_with_single_expr_and_alias__plan0_optimized.sql | 1 +
 ..._with_measures_from_multiple_sources_no_dimensions__plan0.sql | 1 +
 ...ures_from_multiple_sources_no_dimensions__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Snowflake/test_min_max_metric_time__plan0.sql   | 1 +
 .../Snowflake/test_min_max_metric_time__plan0_optimized.sql      | 1 +
 .../Snowflake/test_min_max_metric_time_week__plan0.sql           | 1 +
 .../Snowflake/test_min_max_metric_time_week__plan0_optimized.sql | 1 +
 .../Snowflake/test_min_max_only_categorical__plan0.sql           | 1 +
 .../Snowflake/test_min_max_only_categorical__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Snowflake/test_min_max_only_time__plan0.sql     | 1 +
 .../Snowflake/test_min_max_only_time__plan0_optimized.sql        | 1 +
 .../Snowflake/test_min_max_only_time_quarter__plan0.sql          | 1 +
 .../test_min_max_only_time_quarter__plan0_optimized.sql          | 1 +
 .../Snowflake/test_multi_hop_through_scd_dimension__plan0.sql    | 1 +
 .../test_multi_hop_through_scd_dimension__plan0_optimized.sql    | 1 +
 .../Snowflake/test_multi_hop_to_scd_dimension__plan0.sql         | 1 +
 .../test_multi_hop_to_scd_dimension__plan0_optimized.sql         | 1 +
 .../SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql         | 1 +
 .../Snowflake/test_multihop_node__plan0_optimized.sql            | 1 +
 .../Snowflake/test_multiple_metrics_no_dimensions__plan0.sql     | 1 +
 .../test_multiple_metrics_no_dimensions__plan0_optimized.sql     | 1 +
 ...test_non_additive_dimension_with_non_default_grain__plan0.sql | 1 +
 ...dditive_dimension_with_non_default_grain__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql      | 1 +
 .../Snowflake/test_partitioned_join__plan0_optimized.sql         | 1 +
 .../SqlQueryPlan/Trino/test_common_semantic_model__plan0.sql     | 1 +
 .../Trino/test_common_semantic_model__plan0_optimized.sql        | 1 +
 .../SqlQueryPlan/Trino/test_distinct_values__plan0.sql           | 1 +
 .../SqlQueryPlan/Trino/test_distinct_values__plan0_optimized.sql | 1 +
 .../test_filter_with_where_constraint_on_join_dim__plan0.sql     | 1 +
 ...filter_with_where_constraint_on_join_dim__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_join_to_scd_dimension__plan0.sql     | 1 +
 .../Trino/test_join_to_scd_dimension__plan0_optimized.sql        | 1 +
 .../SqlQueryPlan/Trino/test_limit_rows__plan0.sql                | 1 +
 .../SqlQueryPlan/Trino/test_limit_rows__plan0_optimized.sql      | 1 +
 .../Trino/test_local_dimension_using_local_entity__plan0.sql     | 1 +
 .../test_local_dimension_using_local_entity__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_measure_constraint__plan0.sql        | 1 +
 .../Trino/test_measure_constraint__plan0_optimized.sql           | 1 +
 .../Trino/test_measure_constraint_with_reused_measure__plan0.sql | 1 +
 ...t_measure_constraint_with_reused_measure__plan0_optimized.sql | 1 +
 ...test_measure_constraint_with_single_expr_and_alias__plan0.sql | 1 +
 ...re_constraint_with_single_expr_and_alias__plan0_optimized.sql | 1 +
 ..._with_measures_from_multiple_sources_no_dimensions__plan0.sql | 1 +
 ...ures_from_multiple_sources_no_dimensions__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_min_max_metric_time__plan0.sql       | 1 +
 .../Trino/test_min_max_metric_time__plan0_optimized.sql          | 1 +
 .../SqlQueryPlan/Trino/test_min_max_metric_time_week__plan0.sql  | 1 +
 .../Trino/test_min_max_metric_time_week__plan0_optimized.sql     | 1 +
 .../SqlQueryPlan/Trino/test_min_max_only_categorical__plan0.sql  | 1 +
 .../Trino/test_min_max_only_categorical__plan0_optimized.sql     | 1 +
 .../SqlQueryPlan/Trino/test_min_max_only_time__plan0.sql         | 1 +
 .../Trino/test_min_max_only_time__plan0_optimized.sql            | 1 +
 .../SqlQueryPlan/Trino/test_min_max_only_time_quarter__plan0.sql | 1 +
 .../Trino/test_min_max_only_time_quarter__plan0_optimized.sql    | 1 +
 .../Trino/test_multi_hop_through_scd_dimension__plan0.sql        | 1 +
 .../test_multi_hop_through_scd_dimension__plan0_optimized.sql    | 1 +
 .../Trino/test_multi_hop_to_scd_dimension__plan0.sql             | 1 +
 .../Trino/test_multi_hop_to_scd_dimension__plan0_optimized.sql   | 1 +
 .../SqlQueryPlan/Trino/test_multihop_node__plan0.sql             | 1 +
 .../SqlQueryPlan/Trino/test_multihop_node__plan0_optimized.sql   | 1 +
 .../Trino/test_multiple_metrics_no_dimensions__plan0.sql         | 1 +
 .../test_multiple_metrics_no_dimensions__plan0_optimized.sql     | 1 +
 ...test_non_additive_dimension_with_non_default_grain__plan0.sql | 1 +
 ...dditive_dimension_with_non_default_grain__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_partitioned_join__plan0.sql          | 1 +
 .../Trino/test_partitioned_join__plan0_optimized.sql             | 1 +
 .../str/BigQuery/test_id_enumeration__query.sql                  | 1 +
 .../str/BigQuery/test_render_query__query0.sql                   | 1 +
 .../str/Databricks/test_id_enumeration__query.sql                | 1 +
 .../str/Databricks/test_render_query__query0.sql                 | 1 +
 .../str/DuckDB/test_id_enumeration__query.sql                    | 1 +
 .../str/DuckDB/test_render_query__query0.sql                     | 1 +
 .../str/Postgres/test_id_enumeration__query.sql                  | 1 +
 .../str/Postgres/test_render_query__query0.sql                   | 1 +
 .../str/Redshift/test_id_enumeration__query.sql                  | 1 +
 .../str/Redshift/test_render_query__query0.sql                   | 1 +
 .../str/Snowflake/test_id_enumeration__query.sql                 | 1 +
 .../str/Snowflake/test_render_query__query0.sql                  | 1 +
 .../str/Trino/test_id_enumeration__query.sql                     | 1 +
 .../str/Trino/test_render_query__query0.sql                      | 1 +
 .../SqlQueryPlan/BigQuery/test_component_rendering__plan0.sql    | 1 +
 .../SqlQueryPlan/BigQuery/test_component_rendering__plan1.sql    | 1 +
 .../SqlQueryPlan/BigQuery/test_component_rendering__plan2.sql    | 1 +
 .../SqlQueryPlan/BigQuery/test_component_rendering__plan3.sql    | 1 +
 .../SqlQueryPlan/BigQuery/test_component_rendering__plan4.sql    | 1 +
 .../SqlQueryPlan/BigQuery/test_component_rendering__plan5.sql    | 1 +
 .../BigQuery/test_render_create_table_as__create_table_as.sql    | 1 +
 .../BigQuery/test_render_create_table_as__create_view_as.sql     | 1 +
 .../SqlQueryPlan/BigQuery/test_render_limit__plan0.sql           | 1 +
 .../SqlQueryPlan/BigQuery/test_render_order_by__plan0.sql        | 1 +
 .../SqlQueryPlan/BigQuery/test_render_where__plan0.sql           | 1 +
 .../SqlQueryPlan/Databricks/test_component_rendering__plan0.sql  | 1 +
 .../SqlQueryPlan/Databricks/test_component_rendering__plan1.sql  | 1 +
 .../SqlQueryPlan/Databricks/test_component_rendering__plan2.sql  | 1 +
 .../SqlQueryPlan/Databricks/test_component_rendering__plan3.sql  | 1 +
 .../SqlQueryPlan/Databricks/test_component_rendering__plan4.sql  | 1 +
 .../SqlQueryPlan/Databricks/test_component_rendering__plan5.sql  | 1 +
 .../Databricks/test_render_create_table_as__create_table_as.sql  | 1 +
 .../Databricks/test_render_create_table_as__create_view_as.sql   | 1 +
 .../SqlQueryPlan/Databricks/test_render_limit__plan0.sql         | 1 +
 .../SqlQueryPlan/Databricks/test_render_order_by__plan0.sql      | 1 +
 .../SqlQueryPlan/Databricks/test_render_where__plan0.sql         | 1 +
 .../SqlQueryPlan/DuckDB/test_component_rendering__plan0.sql      | 1 +
 .../SqlQueryPlan/DuckDB/test_component_rendering__plan1.sql      | 1 +
 .../SqlQueryPlan/DuckDB/test_component_rendering__plan2.sql      | 1 +
 .../SqlQueryPlan/DuckDB/test_component_rendering__plan3.sql      | 1 +
 .../SqlQueryPlan/DuckDB/test_component_rendering__plan4.sql      | 1 +
 .../SqlQueryPlan/DuckDB/test_component_rendering__plan5.sql      | 1 +
 .../DuckDB/test_render_create_table_as__create_table_as.sql      | 1 +
 .../DuckDB/test_render_create_table_as__create_view_as.sql       | 1 +
 .../SqlQueryPlan/DuckDB/test_render_limit__plan0.sql             | 1 +
 .../SqlQueryPlan/DuckDB/test_render_order_by__plan0.sql          | 1 +
 .../SqlQueryPlan/DuckDB/test_render_where__plan0.sql             | 1 +
 .../SqlQueryPlan/Postgres/test_component_rendering__plan0.sql    | 1 +
 .../SqlQueryPlan/Postgres/test_component_rendering__plan1.sql    | 1 +
 .../SqlQueryPlan/Postgres/test_component_rendering__plan2.sql    | 1 +
 .../SqlQueryPlan/Postgres/test_component_rendering__plan3.sql    | 1 +
 .../SqlQueryPlan/Postgres/test_component_rendering__plan4.sql    | 1 +
 .../SqlQueryPlan/Postgres/test_component_rendering__plan5.sql    | 1 +
 .../Postgres/test_render_create_table_as__create_table_as.sql    | 1 +
 .../Postgres/test_render_create_table_as__create_view_as.sql     | 1 +
 .../SqlQueryPlan/Postgres/test_render_limit__plan0.sql           | 1 +
 .../SqlQueryPlan/Postgres/test_render_order_by__plan0.sql        | 1 +
 .../SqlQueryPlan/Postgres/test_render_where__plan0.sql           | 1 +
 .../SqlQueryPlan/Redshift/test_component_rendering__plan0.sql    | 1 +
 .../SqlQueryPlan/Redshift/test_component_rendering__plan1.sql    | 1 +
 .../SqlQueryPlan/Redshift/test_component_rendering__plan2.sql    | 1 +
 .../SqlQueryPlan/Redshift/test_component_rendering__plan3.sql    | 1 +
 .../SqlQueryPlan/Redshift/test_component_rendering__plan4.sql    | 1 +
 .../SqlQueryPlan/Redshift/test_component_rendering__plan5.sql    | 1 +
 .../Redshift/test_render_create_table_as__create_table_as.sql    | 1 +
 .../Redshift/test_render_create_table_as__create_view_as.sql     | 1 +
 .../SqlQueryPlan/Redshift/test_render_limit__plan0.sql           | 1 +
 .../SqlQueryPlan/Redshift/test_render_order_by__plan0.sql        | 1 +
 .../SqlQueryPlan/Redshift/test_render_where__plan0.sql           | 1 +
 .../SqlQueryPlan/Snowflake/test_component_rendering__plan0.sql   | 1 +
 .../SqlQueryPlan/Snowflake/test_component_rendering__plan1.sql   | 1 +
 .../SqlQueryPlan/Snowflake/test_component_rendering__plan2.sql   | 1 +
 .../SqlQueryPlan/Snowflake/test_component_rendering__plan3.sql   | 1 +
 .../SqlQueryPlan/Snowflake/test_component_rendering__plan4.sql   | 1 +
 .../SqlQueryPlan/Snowflake/test_component_rendering__plan5.sql   | 1 +
 .../Snowflake/test_render_create_table_as__create_table_as.sql   | 1 +
 .../Snowflake/test_render_create_table_as__create_view_as.sql    | 1 +
 .../SqlQueryPlan/Snowflake/test_render_limit__plan0.sql          | 1 +
 .../SqlQueryPlan/Snowflake/test_render_order_by__plan0.sql       | 1 +
 .../SqlQueryPlan/Snowflake/test_render_where__plan0.sql          | 1 +
 .../SqlQueryPlan/Trino/test_component_rendering__plan0.sql       | 1 +
 .../SqlQueryPlan/Trino/test_component_rendering__plan1.sql       | 1 +
 .../SqlQueryPlan/Trino/test_component_rendering__plan2.sql       | 1 +
 .../SqlQueryPlan/Trino/test_component_rendering__plan3.sql       | 1 +
 .../SqlQueryPlan/Trino/test_component_rendering__plan4.sql       | 1 +
 .../SqlQueryPlan/Trino/test_component_rendering__plan5.sql       | 1 +
 .../Trino/test_render_create_table_as__create_table_as.sql       | 1 +
 .../Trino/test_render_create_table_as__create_view_as.sql        | 1 +
 .../SqlQueryPlan/Trino/test_render_limit__plan0.sql              | 1 +
 .../SqlQueryPlan/Trino/test_render_order_by__plan0.sql           | 1 +
 .../SqlQueryPlan/Trino/test_render_where__plan0.sql              | 1 +
 ...t_join_to_time_spine_with_input_measure_constraint__plan0.sql | 1 +
 ...time_spine_with_input_measure_constraint__plan0_optimized.sql | 1 +
 ...st_join_to_time_spine_with_queried_time_constraint__plan0.sql | 1 +
 ..._time_spine_with_queried_time_constraint__plan0_optimized.sql | 1 +
 .../BigQuery/test_simple_join_to_time_spine__plan0.sql           | 1 +
 .../BigQuery/test_simple_join_to_time_spine__plan0_optimized.sql | 1 +
 .../test_simple_join_to_time_spine_with_filter__plan0.sql        | 1 +
 ...st_simple_join_to_time_spine_with_filter__plan0_optimized.sql | 1 +
 ...test_simple_join_to_time_spine_with_queried_filter__plan0.sql | 1 +
 ...e_join_to_time_spine_with_queried_filter__plan0_optimized.sql | 1 +
 ...t_join_to_time_spine_with_input_measure_constraint__plan0.sql | 1 +
 ...time_spine_with_input_measure_constraint__plan0_optimized.sql | 1 +
 ...st_join_to_time_spine_with_queried_time_constraint__plan0.sql | 1 +
 ..._time_spine_with_queried_time_constraint__plan0_optimized.sql | 1 +
 .../Databricks/test_simple_join_to_time_spine__plan0.sql         | 1 +
 .../test_simple_join_to_time_spine__plan0_optimized.sql          | 1 +
 .../test_simple_join_to_time_spine_with_filter__plan0.sql        | 1 +
 ...st_simple_join_to_time_spine_with_filter__plan0_optimized.sql | 1 +
 ...test_simple_join_to_time_spine_with_queried_filter__plan0.sql | 1 +
 ...e_join_to_time_spine_with_queried_filter__plan0_optimized.sql | 1 +
 ...t_join_to_time_spine_with_input_measure_constraint__plan0.sql | 1 +
 ...time_spine_with_input_measure_constraint__plan0_optimized.sql | 1 +
 ...st_join_to_time_spine_with_queried_time_constraint__plan0.sql | 1 +
 ..._time_spine_with_queried_time_constraint__plan0_optimized.sql | 1 +
 .../DuckDB/test_simple_join_to_time_spine__plan0.sql             | 1 +
 .../DuckDB/test_simple_join_to_time_spine__plan0_optimized.sql   | 1 +
 .../DuckDB/test_simple_join_to_time_spine_with_filter__plan0.sql | 1 +
 ...st_simple_join_to_time_spine_with_filter__plan0_optimized.sql | 1 +
 ...test_simple_join_to_time_spine_with_queried_filter__plan0.sql | 1 +
 ...e_join_to_time_spine_with_queried_filter__plan0_optimized.sql | 1 +
 ...t_join_to_time_spine_with_input_measure_constraint__plan0.sql | 1 +
 ...time_spine_with_input_measure_constraint__plan0_optimized.sql | 1 +
 ...st_join_to_time_spine_with_queried_time_constraint__plan0.sql | 1 +
 ..._time_spine_with_queried_time_constraint__plan0_optimized.sql | 1 +
 .../Postgres/test_simple_join_to_time_spine__plan0.sql           | 1 +
 .../Postgres/test_simple_join_to_time_spine__plan0_optimized.sql | 1 +
 .../test_simple_join_to_time_spine_with_filter__plan0.sql        | 1 +
 ...st_simple_join_to_time_spine_with_filter__plan0_optimized.sql | 1 +
 ...test_simple_join_to_time_spine_with_queried_filter__plan0.sql | 1 +
 ...e_join_to_time_spine_with_queried_filter__plan0_optimized.sql | 1 +
 ...t_join_to_time_spine_with_input_measure_constraint__plan0.sql | 1 +
 ...time_spine_with_input_measure_constraint__plan0_optimized.sql | 1 +
 ...st_join_to_time_spine_with_queried_time_constraint__plan0.sql | 1 +
 ..._time_spine_with_queried_time_constraint__plan0_optimized.sql | 1 +
 .../Redshift/test_simple_join_to_time_spine__plan0.sql           | 1 +
 .../Redshift/test_simple_join_to_time_spine__plan0_optimized.sql | 1 +
 .../test_simple_join_to_time_spine_with_filter__plan0.sql        | 1 +
 ...st_simple_join_to_time_spine_with_filter__plan0_optimized.sql | 1 +
 ...test_simple_join_to_time_spine_with_queried_filter__plan0.sql | 1 +
 ...e_join_to_time_spine_with_queried_filter__plan0_optimized.sql | 1 +
 ...t_join_to_time_spine_with_input_measure_constraint__plan0.sql | 1 +
 ...time_spine_with_input_measure_constraint__plan0_optimized.sql | 1 +
 ...st_join_to_time_spine_with_queried_time_constraint__plan0.sql | 1 +
 ..._time_spine_with_queried_time_constraint__plan0_optimized.sql | 1 +
 .../Snowflake/test_simple_join_to_time_spine__plan0.sql          | 1 +
 .../test_simple_join_to_time_spine__plan0_optimized.sql          | 1 +
 .../test_simple_join_to_time_spine_with_filter__plan0.sql        | 1 +
 ...st_simple_join_to_time_spine_with_filter__plan0_optimized.sql | 1 +
 ...test_simple_join_to_time_spine_with_queried_filter__plan0.sql | 1 +
 ...e_join_to_time_spine_with_queried_filter__plan0_optimized.sql | 1 +
 ...t_join_to_time_spine_with_input_measure_constraint__plan0.sql | 1 +
 ...time_spine_with_input_measure_constraint__plan0_optimized.sql | 1 +
 ...st_join_to_time_spine_with_queried_time_constraint__plan0.sql | 1 +
 ..._time_spine_with_queried_time_constraint__plan0_optimized.sql | 1 +
 .../SqlQueryPlan/Trino/test_simple_join_to_time_spine__plan0.sql | 1 +
 .../Trino/test_simple_join_to_time_spine__plan0_optimized.sql    | 1 +
 .../Trino/test_simple_join_to_time_spine_with_filter__plan0.sql  | 1 +
 ...st_simple_join_to_time_spine_with_filter__plan0_optimized.sql | 1 +
 ...test_simple_join_to_time_spine_with_queried_filter__plan0.sql | 1 +
 ...e_join_to_time_spine_with_queried_filter__plan0_optimized.sql | 1 +
 2814 files changed, 2814 insertions(+)

diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric__plan0.sql
index f8ae8c5c1..d6ceca98a 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric__plan0_optimized.sql
index 664437ce8..36c2f98ca 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0.sql
index 857433f16..25d0b7f85 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_categorical_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a categorical filter.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
index bea04fdbf..01441216e 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_categorical_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a categorical filter.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_different_time_dimension_grains__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
index 4e6508f45..701761343 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_different_time_dimension_grains
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
index bcc5cf318..da6e1d19a 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_different_time_dimension_grains
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter__plan0.sql
index 81b504bc6..55f7b4777 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter__plan0_optimized.sql
index f76809ae3..3f0293851 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
index ef25fb879..1bc8f522d 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter_not_in_group_by
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
index a43c33f27..9d398ecaa 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter_not_in_group_by
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0.sql
index 9b7dcbf97..bb916905d 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a time constraint and categorical filter.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0_optimized.sql
index 1c6647bda..91a3f26b4 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a time constraint and categorical filter.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window__plan0.sql
index 28939c6cd..33c55bafe 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window__plan0_optimized.sql
index 07802da66..2043cb1ed 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window_and_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window_and_time_constraint__plan0.sql
index c7c9942b6..97d621306 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window_and_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window_and_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window_and_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window, time constraint, and categorical filter.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
index 774c784b2..4e7e8718a 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window_and_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window, time constraint, and categorical filter.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric__plan0.sql
index e6308b1fb..34c025db7 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric__plan0_optimized.sql
index 4ab162d3a..b457ac488 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_categorical_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_categorical_filter__plan0.sql
index 288f0249f..fe3c17bda 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_categorical_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_categorical_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_categorical_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a categorical filter.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_categorical_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
index 7b89cf97a..ef062257c 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_categorical_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a categorical filter.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_different_time_dimension_grains__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
index ce4f3725e..1cdc4a67a 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_different_time_dimension_grains
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
index f51940b03..71ce206fd 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_different_time_dimension_grains
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter__plan0.sql
index 28c19e3ae..5bff067ce 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter__plan0_optimized.sql
index c61d2124d..5b6ba3bf5 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
index 16224a446..e4eb2648e 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter_not_in_group_by
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
index 5dc5f373e..58e10e552 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter_not_in_group_by
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_time_constraint__plan0.sql
index 64ef7c634..0a7c68bfd 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a time constraint and categorical filter.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_time_constraint__plan0_optimized.sql
index 3a67233df..6d3ee51b0 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a time constraint and categorical filter.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window__plan0.sql
index 6048f6f98..92887acbc 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window__plan0_optimized.sql
index 60948b7c5..f197a031a 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window_and_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window_and_time_constraint__plan0.sql
index 5c519347f..6400dfbcb 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window_and_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window_and_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window_and_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window, time constraint, and categorical filter.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
index e6870f70d..436888a60 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window_and_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window, time constraint, and categorical filter.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric__plan0.sql
index 508b81403..f5ab1e485 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric__plan0_optimized.sql
index af4f0e6e8..a897a1e20 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_categorical_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_categorical_filter__plan0.sql
index 5cf792812..d68cc6cb8 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_categorical_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_categorical_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_categorical_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a categorical filter.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_categorical_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
index cc0b9d452..f6f89ff4c 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_categorical_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a categorical filter.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_different_time_dimension_grains__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
index 7898aea42..67f0a2ad6 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_different_time_dimension_grains
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
index bd853c11b..44664050d 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_different_time_dimension_grains
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter__plan0.sql
index c6e8d8562..e8f94f67c 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter__plan0_optimized.sql
index 8b7c3ad9c..c9a022201 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
index 750ee7c86..7465fe603 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter_not_in_group_by
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
index 3cb2f2833..6d88593af 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter_not_in_group_by
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_time_constraint__plan0.sql
index a457070fd..69a25cd48 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a time constraint and categorical filter.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_time_constraint__plan0_optimized.sql
index 97d7c95d3..cd85a3b7f 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a time constraint and categorical filter.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window__plan0.sql
index 05b2341cd..d78920569 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window__plan0_optimized.sql
index 427c1c412..f818227f4 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window_and_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window_and_time_constraint__plan0.sql
index 4209390c2..198f58f89 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window_and_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window_and_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window_and_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window, time constraint, and categorical filter.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
index e3a578d7c..7abd4226a 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window_and_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window, time constraint, and categorical filter.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric__plan0.sql
index 4b8e7116f..adc14f038 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric__plan0_optimized.sql
index a61dca03a..1f2a93488 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_categorical_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_categorical_filter__plan0.sql
index 8ca4a4c9a..369ee7144 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_categorical_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_categorical_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_categorical_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a categorical filter.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_categorical_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
index 234713904..688b283a1 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_categorical_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a categorical filter.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_different_time_dimension_grains__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
index a5fd43d0b..1547e6b86 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_different_time_dimension_grains
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
index 5b8c5d64b..b9eec9f47 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_different_time_dimension_grains
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter__plan0.sql
index 5de3b84d5..e942104b4 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter__plan0_optimized.sql
index 95f4e0db4..ec0a5385b 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
index d70d3c75e..f1bb5fd5a 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter_not_in_group_by
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
index 4b7b2412d..25f4ea4d8 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter_not_in_group_by
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_time_constraint__plan0.sql
index fee729d2b..d49a90a33 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a time constraint and categorical filter.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_time_constraint__plan0_optimized.sql
index 56abc9fa4..ada5decec 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a time constraint and categorical filter.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window__plan0.sql
index 11923a26f..b957ea806 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window__plan0_optimized.sql
index 223d9a810..ccd1e95f6 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window_and_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window_and_time_constraint__plan0.sql
index bedf09623..61a1d9f04 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window_and_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window_and_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window_and_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window, time constraint, and categorical filter.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
index 72f8f2b55..82b11fdb6 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window_and_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window, time constraint, and categorical filter.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric__plan0.sql
index 82dce99f1..2357246f1 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric__plan0_optimized.sql
index 40083d4db..3b95cacc7 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_categorical_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_categorical_filter__plan0.sql
index 5a1acf507..347506866 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_categorical_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_categorical_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_categorical_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a categorical filter.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_categorical_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
index 05724b909..a0ca54c6d 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_categorical_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a categorical filter.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_different_time_dimension_grains__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
index bc53aaa51..32e9b0916 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_different_time_dimension_grains
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
index 85a662a9d..874cd3a7a 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_different_time_dimension_grains
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter__plan0.sql
index 1dbf9718f..d7891cfde 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter__plan0_optimized.sql
index 637d2eb07..ecc90a883 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
index 88e0803b0..ff7cdd4dd 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter_not_in_group_by
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
index f77583d66..61fb1b6da 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter_not_in_group_by
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_time_constraint__plan0.sql
index a4a3cbcbd..794440d34 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a time constraint and categorical filter.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_time_constraint__plan0_optimized.sql
index 2cd381752..60a92d217 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a time constraint and categorical filter.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window__plan0.sql
index 0be0fc6a6..8b98091bd 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window__plan0_optimized.sql
index a17f9dbd2..114d5c6fa 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window_and_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window_and_time_constraint__plan0.sql
index d2cf8c2e9..b5da2f648 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window_and_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window_and_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window_and_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window, time constraint, and categorical filter.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
index f4efc628b..344d49dd7 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window_and_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window, time constraint, and categorical filter.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric__plan0.sql
index 5a5aaeb97..0c037cac3 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric__plan0_optimized.sql
index 707370b16..e907f0d12 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_categorical_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_categorical_filter__plan0.sql
index abc0dde7f..1208f676e 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_categorical_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_categorical_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_categorical_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a categorical filter.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_categorical_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
index 6fd688c48..0202f0aed 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_categorical_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a categorical filter.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_different_time_dimension_grains__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
index 184bb75c6..3cc3af77b 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_different_time_dimension_grains
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
index 7512ef916..a55d996d9 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_different_time_dimension_grains
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter__plan0.sql
index ff2593188..e211045c3 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter__plan0_optimized.sql
index 69aac853b..aeddce3b1 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
index 1f16a96a5..62a1e00d2 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter_not_in_group_by
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
index 7471826ea..85f557d73 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter_not_in_group_by
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_time_constraint__plan0.sql
index 686845316..ed5b0af38 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a time constraint and categorical filter.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_time_constraint__plan0_optimized.sql
index b8e12265d..e07698817 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a time constraint and categorical filter.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window__plan0.sql
index cb206e272..477c8f0f6 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window__plan0_optimized.sql
index 5bfd6106a..28bf4c479 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window_and_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window_and_time_constraint__plan0.sql
index 3687a3b88..67327b08c 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window_and_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window_and_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window_and_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window, time constraint, and categorical filter.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
index 6052c066c..3657a3cbc 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window_and_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window, time constraint, and categorical filter.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric__plan0.sql
index 54a24c0ae..f6f6dc777 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric__plan0_optimized.sql
index d6b2428ab..8ee53e27b 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_categorical_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_categorical_filter__plan0.sql
index 6f1f5a44f..d8006c423 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_categorical_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_categorical_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_categorical_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a categorical filter.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_categorical_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
index 54a6bb0a3..271335993 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_categorical_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a categorical filter.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_different_time_dimension_grains__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
index 60db263e5..f65fa2805 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_different_time_dimension_grains__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_different_time_dimension_grains
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
index 7e0443d6a..9726e83f5 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_different_time_dimension_grains__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_different_time_dimension_grains
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter__plan0.sql
index 4b9981cf5..74d95f3d9 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter__plan0_optimized.sql
index c562ccad4..e4176f7af 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
index 0c2037207..f19640639 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter_not_in_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter_not_in_group_by
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
index bf08bb885..b430e6fe5 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_filter_not_in_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_filter_not_in_group_by
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric.
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_time_constraint__plan0.sql
index d652f4653..a9475d529 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a time constraint and categorical filter.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_time_constraint__plan0_optimized.sql
index 004777251..036426ff2 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a time constraint and categorical filter.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window__plan0.sql
index b563fe339..aad79bfd4 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window__plan0_optimized.sql
index da3a95bc0..e08ec951d 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window_and_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window_and_time_constraint__plan0.sql
index 34df32b7f..0fd3689d2 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window_and_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window_and_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window_and_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window, time constraint, and categorical filter.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
index 7f8be1f97..c7b2714a5 100644
--- a/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metric_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_with_window_and_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_with_window_and_time_constraint
 test_filename: test_conversion_metric_rendering.py
 docstring:
   Test rendering a query against a conversion metric with a window, time constraint, and categorical filter.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_count_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_count_with_no_group_by__plan0.sql
index d7aa72453..55535575e 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_count_with_no_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_count_with_no_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_count_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_count_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_count_with_no_group_by__plan0_optimized.sql
index bb57cf007..1267ebb04 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_count_with_no_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_count_with_no_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_count_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
index 2810e908f..bc61defee 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_join_to_timespine_and_fill_nulls_with_0
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric that joins to time spine and fills nulls with 0.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
index 8b366b8ca..eab4d41c7 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_join_to_timespine_and_fill_nulls_with_0
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric that joins to time spine and fills nulls with 0.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate__plan0.sql
index 6ff4eaeb2..f1644b54c 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric data flow plan rendering.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate__plan0_optimized.sql
index 4ae14a4fe..a8f6fb72d 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric data flow plan rendering.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_constant_properties__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_constant_properties__plan0.sql
index c87b846b1..a83d2df7a 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_constant_properties__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_constant_properties__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_constant_properties
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with constant properties by data flow plan rendering.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_constant_properties__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_constant_properties__plan0_optimized.sql
index fcd1e5a08..2bbbc7574 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_constant_properties__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_constant_properties__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_constant_properties
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with constant properties by data flow plan rendering.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_no_group_by__plan0.sql
index 5e3cfa829..c963dc581 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_no_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_no_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_no_group_by__plan0_optimized.sql
index 22369744a..183e1f7b0 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_no_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_no_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_window__plan0.sql
index 816fe842a..7e26db637 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_window
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with a window data flow plan rendering.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_window__plan0_optimized.sql
index 7ca2f0ee1..038bda649 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/BigQuery/test_conversion_rate_with_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_window
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with a window data flow plan rendering.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_count_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_count_with_no_group_by__plan0.sql
index b026bdbdd..a8332a448 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_count_with_no_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_count_with_no_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_count_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_count_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_count_with_no_group_by__plan0_optimized.sql
index ba9409115..6b4bf6b28 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_count_with_no_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_count_with_no_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_count_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
index 98e2dc96c..4d2bb52ed 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_join_to_timespine_and_fill_nulls_with_0
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric that joins to time spine and fills nulls with 0.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
index 7df9acfe2..f5a58a70f 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_join_to_timespine_and_fill_nulls_with_0
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric that joins to time spine and fills nulls with 0.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate__plan0.sql
index 4eda32e1a..e24d510c9 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric data flow plan rendering.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate__plan0_optimized.sql
index 9b9d075db..0c21b78b8 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric data flow plan rendering.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_constant_properties__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_constant_properties__plan0.sql
index 0d2da759e..c69c8f8d3 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_constant_properties__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_constant_properties__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_constant_properties
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with constant properties by data flow plan rendering.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_constant_properties__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_constant_properties__plan0_optimized.sql
index 8b02baead..56dc8aa18 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_constant_properties__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_constant_properties__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_constant_properties
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with constant properties by data flow plan rendering.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_no_group_by__plan0.sql
index 27bde82c1..c8d1494b5 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_no_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_no_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_no_group_by__plan0_optimized.sql
index 24e893cf7..91c5c6652 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_no_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_no_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_window__plan0.sql
index 4e7f57fa9..59257d02e 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_window
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with a window data flow plan rendering.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_window__plan0_optimized.sql
index 58cf97f1a..4d601ef64 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Databricks/test_conversion_rate_with_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_window
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with a window data flow plan rendering.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_count_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_count_with_no_group_by__plan0.sql
index fc77b5983..1b86cca4b 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_count_with_no_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_count_with_no_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_count_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_count_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_count_with_no_group_by__plan0_optimized.sql
index def37d78b..d52f20bc3 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_count_with_no_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_count_with_no_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_count_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
index 5288d9c5b..c6d3fb1d0 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_join_to_timespine_and_fill_nulls_with_0
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric that joins to time spine and fills nulls with 0.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
index 65e576174..7221fbdec 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_join_to_timespine_and_fill_nulls_with_0
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric that joins to time spine and fills nulls with 0.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate__plan0.sql
index 5f125fdee..b97de249e 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric data flow plan rendering.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate__plan0_optimized.sql
index 6ebbe901e..2375a22b4 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric data flow plan rendering.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_constant_properties__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_constant_properties__plan0.sql
index 7a80ab6c8..78e4c8fe5 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_constant_properties__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_constant_properties__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_constant_properties
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with constant properties by data flow plan rendering.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_constant_properties__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_constant_properties__plan0_optimized.sql
index cc2e7c6ae..cc21cc694 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_constant_properties__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_constant_properties__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_constant_properties
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with constant properties by data flow plan rendering.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_no_group_by__plan0.sql
index bf9e8e66b..817362385 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_no_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_no_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_no_group_by__plan0_optimized.sql
index cea9e6fb9..12d9bcee0 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_no_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_no_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_window__plan0.sql
index f0a46293a..c5fa85c3f 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_window
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with a window data flow plan rendering.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_window__plan0_optimized.sql
index 5338f8b8d..1e68f8456 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/DuckDB/test_conversion_rate_with_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_window
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with a window data flow plan rendering.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_count_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_count_with_no_group_by__plan0.sql
index f9c9eaf19..04988a0fb 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_count_with_no_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_count_with_no_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_count_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_count_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_count_with_no_group_by__plan0_optimized.sql
index c833243b7..53d7571ad 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_count_with_no_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_count_with_no_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_count_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
index a5e2da662..e173816d0 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_join_to_timespine_and_fill_nulls_with_0
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric that joins to time spine and fills nulls with 0.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
index 6b06d81d6..00ff936d0 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_join_to_timespine_and_fill_nulls_with_0
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric that joins to time spine and fills nulls with 0.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate__plan0.sql
index a16b9cce5..8c539e50d 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric data flow plan rendering.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate__plan0_optimized.sql
index d48db4d53..97c2f6f0b 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric data flow plan rendering.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_constant_properties__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_constant_properties__plan0.sql
index 0d6106eb5..434bf13e0 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_constant_properties__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_constant_properties__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_constant_properties
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with constant properties by data flow plan rendering.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_constant_properties__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_constant_properties__plan0_optimized.sql
index c8e0908cd..6e4425814 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_constant_properties__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_constant_properties__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_constant_properties
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with constant properties by data flow plan rendering.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_no_group_by__plan0.sql
index 9d7ec879b..f2c39470c 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_no_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_no_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_no_group_by__plan0_optimized.sql
index 60392a120..625a688fb 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_no_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_no_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_window__plan0.sql
index 639b3467c..a1a8d909f 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_window
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with a window data flow plan rendering.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_window__plan0_optimized.sql
index 678471aea..18cc7b5f6 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Postgres/test_conversion_rate_with_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_window
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with a window data flow plan rendering.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_count_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_count_with_no_group_by__plan0.sql
index 9ea296487..4f08ca531 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_count_with_no_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_count_with_no_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_count_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_count_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_count_with_no_group_by__plan0_optimized.sql
index d61cb7a6d..2de7bf5d3 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_count_with_no_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_count_with_no_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_count_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
index dacc7c385..80ef25281 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_join_to_timespine_and_fill_nulls_with_0
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric that joins to time spine and fills nulls with 0.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
index 1823b3f55..896945c98 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_join_to_timespine_and_fill_nulls_with_0
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric that joins to time spine and fills nulls with 0.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate__plan0.sql
index caaf449dc..51034a9a5 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric data flow plan rendering.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate__plan0_optimized.sql
index 9c8df907e..726b9bb90 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric data flow plan rendering.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_constant_properties__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_constant_properties__plan0.sql
index d10a54375..c001df687 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_constant_properties__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_constant_properties__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_constant_properties
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with constant properties by data flow plan rendering.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_constant_properties__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_constant_properties__plan0_optimized.sql
index 0e945e81e..805203209 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_constant_properties__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_constant_properties__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_constant_properties
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with constant properties by data flow plan rendering.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_no_group_by__plan0.sql
index f7507b6fd..2dc342952 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_no_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_no_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_no_group_by__plan0_optimized.sql
index 62adf1433..389b6e71e 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_no_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_no_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_window__plan0.sql
index 19e07b8c1..881d9bd52 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_window
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with a window data flow plan rendering.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_window__plan0_optimized.sql
index 22434ab2a..b65402928 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Redshift/test_conversion_rate_with_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_window
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with a window data flow plan rendering.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_count_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_count_with_no_group_by__plan0.sql
index 73dde1702..37abc12cf 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_count_with_no_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_count_with_no_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_count_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_count_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_count_with_no_group_by__plan0_optimized.sql
index e360b334f..45198ff84 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_count_with_no_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_count_with_no_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_count_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
index 4c539b0f1..5c835179a 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_join_to_timespine_and_fill_nulls_with_0
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric that joins to time spine and fills nulls with 0.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
index fde78788f..7a9818076 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_join_to_timespine_and_fill_nulls_with_0
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric that joins to time spine and fills nulls with 0.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate__plan0.sql
index cbb18591d..e30ab9fb8 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric data flow plan rendering.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate__plan0_optimized.sql
index 2015b92d5..198a34d6c 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric data flow plan rendering.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_constant_properties__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_constant_properties__plan0.sql
index d18aa6360..c47ba608d 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_constant_properties__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_constant_properties__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_constant_properties
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with constant properties by data flow plan rendering.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_constant_properties__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_constant_properties__plan0_optimized.sql
index 4d539213b..fcd07294d 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_constant_properties__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_constant_properties__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_constant_properties
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with constant properties by data flow plan rendering.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_no_group_by__plan0.sql
index a359520ed..04fa9511c 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_no_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_no_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_no_group_by__plan0_optimized.sql
index 54277d529..9165dcef4 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_no_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_no_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_window__plan0.sql
index 03d1d18f7..47b6bebf5 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_window
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with a window data flow plan rendering.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_window__plan0_optimized.sql
index 9a7900018..5289cd349 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Snowflake/test_conversion_rate_with_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_window
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with a window data flow plan rendering.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_count_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_count_with_no_group_by__plan0.sql
index e7a92b113..d29dc11cb 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_count_with_no_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_count_with_no_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_count_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_count_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_count_with_no_group_by__plan0_optimized.sql
index 2281b7fbd..ab9c25bc0 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_count_with_no_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_count_with_no_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_count_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
index 32664f521..05af4ab54 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_join_to_timespine_and_fill_nulls_with_0
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric that joins to time spine and fills nulls with 0.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
index 269bc8cf9..5fdf62a89 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_join_to_timespine_and_fill_nulls_with_0
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric that joins to time spine and fills nulls with 0.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate__plan0.sql
index ee5da967d..b533ef11d 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric data flow plan rendering.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate__plan0_optimized.sql
index 3d41f56ec..b4cc1c15b 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric data flow plan rendering.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_constant_properties__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_constant_properties__plan0.sql
index 4ae76f69b..e1f6d601a 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_constant_properties__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_constant_properties__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_constant_properties
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with constant properties by data flow plan rendering.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_constant_properties__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_constant_properties__plan0_optimized.sql
index 03620fb2e..6c39bb950 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_constant_properties__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_constant_properties__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_constant_properties
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with constant properties by data flow plan rendering.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_no_group_by__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_no_group_by__plan0.sql
index e09b4d6ce..cea46012d 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_no_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_no_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_no_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_no_group_by__plan0_optimized.sql
index 9b35859b5..cbf203759 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_no_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_no_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_no_group_by
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with no group by data flow plan rendering.
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_window__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_window__plan0.sql
index bce3086f2..e1fb36ffa 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_window
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with a window data flow plan rendering.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_window__plan0_optimized.sql
index 2895ab522..3cbcfcfba 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/Trino/test_conversion_rate_with_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_rate_with_window
 test_filename: test_conversion_metrics_to_sql.py
 docstring:
   Test conversion metric with a window data flow plan rendering.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql
index b2e0dcad7..a49474f0e 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_convert_query_semantic_model
 test_filename: test_convert_semantic_model.py
+sql_engine: BigQuery
 ---
 -- Read Elements From Semantic Model 'revenue'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql
index 7713ddc8f..047aec308 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -5,6 +5,7 @@ docstring:
 
       Measures trigger a primary time dimension validation. Additionally, this includes both categorical and time
       dimension types, which should cover most, if not all, of the table source branches in the target class.
+sql_engine: BigQuery
 ---
 -- Read Elements From Semantic Model 'id_verifications'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
index 3d99a520a..8803ecb84 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_convert_table_semantic_model_without_measures
 test_filename: test_convert_semantic_model.py
 docstring:
   Simple test for converting a table semantic model. Since there are no measures, primary time is not checked.
+sql_engine: BigQuery
 ---
 -- Read Elements From Semantic Model 'users_latest'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_query_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_query_semantic_model__plan0.sql
index 5db27c1e7..c944c8fa6 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_query_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_query_semantic_model__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_convert_query_semantic_model
 test_filename: test_convert_semantic_model.py
+sql_engine: Databricks
 ---
 -- Read Elements From Semantic Model 'revenue'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_with_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_with_measures__plan0.sql
index 7a9d2d2cb..6013cc3fb 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -5,6 +5,7 @@ docstring:
 
       Measures trigger a primary time dimension validation. Additionally, this includes both categorical and time
       dimension types, which should cover most, if not all, of the table source branches in the target class.
+sql_engine: Databricks
 ---
 -- Read Elements From Semantic Model 'id_verifications'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql
index 5f34bce80..ac8a1086b 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_convert_table_semantic_model_without_measures
 test_filename: test_convert_semantic_model.py
 docstring:
   Simple test for converting a table semantic model. Since there are no measures, primary time is not checked.
+sql_engine: Databricks
 ---
 -- Read Elements From Semantic Model 'users_latest'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql
index 7e34b0001..670c00d16 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_convert_query_semantic_model
 test_filename: test_convert_semantic_model.py
+sql_engine: DuckDB
 ---
 -- Read Elements From Semantic Model 'revenue'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql
index 345cda7ee..399510d4d 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -5,6 +5,7 @@ docstring:
 
       Measures trigger a primary time dimension validation. Additionally, this includes both categorical and time
       dimension types, which should cover most, if not all, of the table source branches in the target class.
+sql_engine: DuckDB
 ---
 -- Read Elements From Semantic Model 'id_verifications'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
index 6d8f56f1d..acf71eab8 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_convert_table_semantic_model_without_measures
 test_filename: test_convert_semantic_model.py
 docstring:
   Simple test for converting a table semantic model. Since there are no measures, primary time is not checked.
+sql_engine: DuckDB
 ---
 -- Read Elements From Semantic Model 'users_latest'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_query_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_query_semantic_model__plan0.sql
index 7e34b0001..0f55a6865 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_query_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_query_semantic_model__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_convert_query_semantic_model
 test_filename: test_convert_semantic_model.py
+sql_engine: Postgres
 ---
 -- Read Elements From Semantic Model 'revenue'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_with_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_with_measures__plan0.sql
index 345cda7ee..cd0b51590 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -5,6 +5,7 @@ docstring:
 
       Measures trigger a primary time dimension validation. Additionally, this includes both categorical and time
       dimension types, which should cover most, if not all, of the table source branches in the target class.
+sql_engine: Postgres
 ---
 -- Read Elements From Semantic Model 'id_verifications'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql
index 6d8f56f1d..d8bf477f4 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_convert_table_semantic_model_without_measures
 test_filename: test_convert_semantic_model.py
 docstring:
   Simple test for converting a table semantic model. Since there are no measures, primary time is not checked.
+sql_engine: Postgres
 ---
 -- Read Elements From Semantic Model 'users_latest'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_query_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_query_semantic_model__plan0.sql
index eb7b6a4d7..0ebd57639 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_query_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_query_semantic_model__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_convert_query_semantic_model
 test_filename: test_convert_semantic_model.py
+sql_engine: Redshift
 ---
 -- Read Elements From Semantic Model 'revenue'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_with_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_with_measures__plan0.sql
index f0a688af6..5e6575a0d 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -5,6 +5,7 @@ docstring:
 
       Measures trigger a primary time dimension validation. Additionally, this includes both categorical and time
       dimension types, which should cover most, if not all, of the table source branches in the target class.
+sql_engine: Redshift
 ---
 -- Read Elements From Semantic Model 'id_verifications'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql
index 8a01dd7dc..30c072720 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_convert_table_semantic_model_without_measures
 test_filename: test_convert_semantic_model.py
 docstring:
   Simple test for converting a table semantic model. Since there are no measures, primary time is not checked.
+sql_engine: Redshift
 ---
 -- Read Elements From Semantic Model 'users_latest'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_query_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_query_semantic_model__plan0.sql
index cc23682a9..015df8ed4 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_query_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_query_semantic_model__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_convert_query_semantic_model
 test_filename: test_convert_semantic_model.py
+sql_engine: Snowflake
 ---
 -- Read Elements From Semantic Model 'revenue'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_with_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_with_measures__plan0.sql
index 2f73d9c24..7e1838665 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -5,6 +5,7 @@ docstring:
 
       Measures trigger a primary time dimension validation. Additionally, this includes both categorical and time
       dimension types, which should cover most, if not all, of the table source branches in the target class.
+sql_engine: Snowflake
 ---
 -- Read Elements From Semantic Model 'id_verifications'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql
index 31dacf281..efd61c052 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_convert_table_semantic_model_without_measures
 test_filename: test_convert_semantic_model.py
 docstring:
   Simple test for converting a table semantic model. Since there are no measures, primary time is not checked.
+sql_engine: Snowflake
 ---
 -- Read Elements From Semantic Model 'users_latest'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_query_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_query_semantic_model__plan0.sql
index f4a1191cc..d7b2c73dd 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_query_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_query_semantic_model__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_convert_query_semantic_model
 test_filename: test_convert_semantic_model.py
+sql_engine: Trino
 ---
 -- Read Elements From Semantic Model 'revenue'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_table_semantic_model_with_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_table_semantic_model_with_measures__plan0.sql
index ffdc5d5c2..69cd32240 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -5,6 +5,7 @@ docstring:
 
       Measures trigger a primary time dimension validation. Additionally, this includes both categorical and time
       dimension types, which should cover most, if not all, of the table source branches in the target class.
+sql_engine: Trino
 ---
 -- Read Elements From Semantic Model 'id_verifications'
 SELECT
diff --git a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_table_semantic_model_without_measures__plan0.sql b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_table_semantic_model_without_measures__plan0.sql
index 2647c738c..014e87592 100644
--- a/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/tests_metricflow/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Trino/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_convert_table_semantic_model_without_measures
 test_filename: test_convert_semantic_model.py
 docstring:
   Simple test for converting a table semantic model. Since there are no measures, primary time is not checked.
+sql_engine: Trino
 ---
 -- Read Elements From Semantic Model 'users_latest'
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0.sql
index a27ccb639..b1e28bc43 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grains.
 
       Uses only metric_time. Excludes default grain.
+sql_engine: BigQuery
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
index a7b287f78..d06659009 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grains.
 
       Uses only metric_time. Excludes default grain.
+sql_engine: BigQuery
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
index 8b96d59ee..3136ad867 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a basic cumulative metric query.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0_optimized.sql
index 36447559b..8b107003d 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a basic cumulative metric query.
+sql_engine: BigQuery
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
index e2590eb89..92c1efcd5 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_grain_to_date
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query against a grain_to_date cumulative metric.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0_optimized.sql
index 54fb03217..277b00bd9 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_grain_to_date
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query against a grain_to_date cumulative metric.
+sql_engine: BigQuery
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
index f7b0247f0..7e8517a06 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_ds
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a cumulative metric with no time dimension specified.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0_optimized.sql
index 09fc4701f..3eb9cdbaa 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_ds
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a cumulative metric with no time dimension specified.
+sql_engine: BigQuery
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
index 24cb31368..a12ab5a59 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query where there is a windowless cumulative metric to compute.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0_optimized.sql
index 7e3e6487a..ca217fe50 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query where there is a windowless cumulative metric to compute.
+sql_engine: BigQuery
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 30045d6f4..41f61d881 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window_with_time_constraint
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a windowless cumulative metric query with an adjustable time constraint.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
index acce3e90f..bc8fc6681 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window_with_time_constraint
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a windowless cumulative metric query with an adjustable time constraint.
+sql_engine: BigQuery
 ---
 -- Join Self Over Time Range
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-01T00:00:00]
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
index af1b0df83..ee6d6790d 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_and_metric_time
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with one agg time dimension and one metric time dimension.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
index 8407313e0..c18ec5df2 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_and_metric_time
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with one agg time dimension and one metric time dimension.
+sql_engine: BigQuery
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'metric_time__day', 'revenue_instance__ds__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_dimension__plan0.sql
index 3ea577dff..ae5df7f91 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_dimension
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with agg time dimension.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
index d6b0798c9..ed99e6a7f 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_dimension
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with agg time dimension.
+sql_engine: BigQuery
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'revenue_instance__ds__day']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
index aa4639cad..3ff0e9dbe 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_agg_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple agg time dimensions.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
index ca715a49e..3ad5807f4 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_agg_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple agg time dimensions.
+sql_engine: BigQuery
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'revenue_instance__ds__day', 'revenue_instance__ds__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
index dc263ebb7..38ff36388 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_metric_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple metric time dimensions.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
index 0d3298fd8..c571203aa 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_metric_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple metric time dimensions.
+sql_engine: BigQuery
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'metric_time__day', 'metric_time__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
index ff86c0d3d..1df839583 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric. When we do not have an adjustable time filter we must include all
       input data in order to ensure the cumulative metric is correct.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
index 3674fd4b6..c81dcd000 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric. When we do not have an adjustable time filter we must include all
       input data in order to ensure the cumulative metric is correct.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0.sql
index 21bea8b15..d854f65b3 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grain.
+sql_engine: BigQuery
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
index 46f9ac371..fdc731c4b 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grain.
+sql_engine: BigQuery
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
index 7f50e249e..02a14037d 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric, but when we receive a time constraint filter expression we can
       automatically adjust it should render a query similar to this one.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
index bd2f8b038..be7b10dd6 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric, but when we receive a time constraint filter expression we can
       automatically adjust it should render a query similar to this one.
+sql_engine: BigQuery
 ---
 -- Join Self Over Time Range
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-01T00:00:00]
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
index 127287d46..4b27d392d 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_derived_cumulative_metric_with_non_default_grains
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Test querying a derived metric with a cumulative input metric using non-default grains.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
index 10ed9b2e0..1548db468 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_derived_cumulative_metric_with_non_default_grains
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Test querying a derived metric with a cumulative input metric using non-default grains.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0.sql
index a988ede17..358bdd9c5 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_grain_to_date_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grain.
+sql_engine: BigQuery
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
index f18898028..15f6b874d 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_grain_to_date_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grain.
+sql_engine: BigQuery
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0.sql
index 0e575fc53..909b0cda4 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grains.
 
       Uses agg time dimension instead of metric_time. Excludes default grain.
+sql_engine: BigQuery
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
index 3f9467433..4a17e00f9 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grains.
 
       Uses agg time dimension instead of metric_time. Excludes default grain.
+sql_engine: BigQuery
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grain__plan0.sql
index 827180070..f1fb9dbf6 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_window_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grain.
+sql_engine: BigQuery
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grain__plan0_optimized.sql
index 191817fe2..c1c9d31fb 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_window_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grain.
+sql_engine: BigQuery
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grains__plan0.sql
index 31dec94bb..d8ffb1b0b 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grains.
 
       Uses both metric_time and agg_time_dimension. Excludes default grain.
+sql_engine: BigQuery
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grains__plan0_optimized.sql
index 62b6ace8e..c0ca6dd62 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grains.
 
       Uses both metric_time and agg_time_dimension. Excludes default grain.
+sql_engine: BigQuery
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_all_time_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_all_time_metric_with_non_default_grains__plan0.sql
index 92bea9af8..35a77c221 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_all_time_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_all_time_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grains.
 
       Uses only metric_time. Excludes default grain.
+sql_engine: Databricks
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_all_time_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
index 7819f94d9..09ec08977 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grains.
 
       Uses only metric_time. Excludes default grain.
+sql_engine: Databricks
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql
index e43f762ed..bc1fa59f0 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a basic cumulative metric query.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0_optimized.sql
index 05c62e60b..5674ffe0f 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a basic cumulative metric query.
+sql_engine: Databricks
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
index 733ec4391..d8104b8ed 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_grain_to_date
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query against a grain_to_date cumulative metric.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0_optimized.sql
index dc3cd87a0..4bc8c8332 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_grain_to_date
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query against a grain_to_date cumulative metric.
+sql_engine: Databricks
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
index 7458902dd..adb7bda8f 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_ds
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a cumulative metric with no time dimension specified.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0_optimized.sql
index 09fc4701f..43a1b06e8 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_ds
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a cumulative metric with no time dimension specified.
+sql_engine: Databricks
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
index 7946b6a19..e8f468d1f 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query where there is a windowless cumulative metric to compute.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0_optimized.sql
index eeb3c39cb..49ec47cae 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query where there is a windowless cumulative metric to compute.
+sql_engine: Databricks
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 5a77b82c8..22a3fe5eb 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window_with_time_constraint
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a windowless cumulative metric query with an adjustable time constraint.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
index d00190e85..51c6ac1c9 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window_with_time_constraint
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a windowless cumulative metric query with an adjustable time constraint.
+sql_engine: Databricks
 ---
 -- Join Self Over Time Range
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-01T00:00:00]
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
index bced093be..1a5da84de 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_and_metric_time
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with one agg time dimension and one metric time dimension.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
index 23058246a..b2bf45098 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_and_metric_time
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with one agg time dimension and one metric time dimension.
+sql_engine: Databricks
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'metric_time__day', 'revenue_instance__ds__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_dimension__plan0.sql
index 59813ec4b..520c1de48 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_dimension
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with agg time dimension.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
index ea7822777..e0946a84b 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_dimension
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with agg time dimension.
+sql_engine: Databricks
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'revenue_instance__ds__day']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
index d9ac89c7d..ebe7833fa 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_agg_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple agg time dimensions.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
index f1cf8e85b..bc466c565 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_agg_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple agg time dimensions.
+sql_engine: Databricks
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'revenue_instance__ds__day', 'revenue_instance__ds__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
index 8af7d9ac9..6f3d45952 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_metric_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple metric time dimensions.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
index 1e00823a9..7228ec9c3 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_metric_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple metric time dimensions.
+sql_engine: Databricks
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'metric_time__day', 'metric_time__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
index 158bedb17..0b4857468 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric. When we do not have an adjustable time filter we must include all
       input data in order to ensure the cumulative metric is correct.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
index 93c8da88c..7d21c2079 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric. When we do not have an adjustable time filter we must include all
       input data in order to ensure the cumulative metric is correct.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_default_grain__plan0.sql
index dbcc2a742..aff40b1c3 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grain.
+sql_engine: Databricks
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
index 45e77ce63..822c9917a 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grain.
+sql_engine: Databricks
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
index 6f65091a3..809291dbe 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric, but when we receive a time constraint filter expression we can
       automatically adjust it should render a query similar to this one.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
index c59c01ed8..0a101d62d 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric, but when we receive a time constraint filter expression we can
       automatically adjust it should render a query similar to this one.
+sql_engine: Databricks
 ---
 -- Join Self Over Time Range
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-01T00:00:00]
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_cumulative_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
index 3bbfb6685..bc13d0245 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_derived_cumulative_metric_with_non_default_grains
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Test querying a derived metric with a cumulative input metric using non-default grains.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
index bc88b14a1..2c2a13232 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_derived_cumulative_metric_with_non_default_grains
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Test querying a derived metric with a cumulative input metric using non-default grains.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grain__plan0.sql
index a15c88a3e..89c8bc75c 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_grain_to_date_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grain.
+sql_engine: Databricks
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
index 284878999..02fcabc9e 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_grain_to_date_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grain.
+sql_engine: Databricks
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grains__plan0.sql
index cac9393c3..509fc2616 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grains.
 
       Uses agg time dimension instead of metric_time. Excludes default grain.
+sql_engine: Databricks
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
index 01775c564..0620a82dd 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grains.
 
       Uses agg time dimension instead of metric_time. Excludes default grain.
+sql_engine: Databricks
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grain__plan0.sql
index 6b9f6ec03..fe85df19c 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_window_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grain.
+sql_engine: Databricks
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grain__plan0_optimized.sql
index 93de1954f..5300b41d3 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_window_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grain.
+sql_engine: Databricks
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grains__plan0.sql
index fefffa46c..a06996713 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grains.
 
       Uses both metric_time and agg_time_dimension. Excludes default grain.
+sql_engine: Databricks
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grains__plan0_optimized.sql
index c5ce42a77..8781e118b 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Databricks/test_window_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grains.
 
       Uses both metric_time and agg_time_dimension. Excludes default grain.
+sql_engine: Databricks
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_all_time_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_all_time_metric_with_non_default_grains__plan0.sql
index 0d6633fb6..e84baf76a 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_all_time_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_all_time_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grains.
 
       Uses only metric_time. Excludes default grain.
+sql_engine: DuckDB
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_all_time_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
index 7819f94d9..392d97a91 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grains.
 
       Uses only metric_time. Excludes default grain.
+sql_engine: DuckDB
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
index 3633d1de1..0a2714624 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a basic cumulative metric query.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0_optimized.sql
index 05c62e60b..0efce7e46 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a basic cumulative metric query.
+sql_engine: DuckDB
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
index 14113cbd4..cdccdf772 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_grain_to_date
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query against a grain_to_date cumulative metric.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0_optimized.sql
index dc3cd87a0..08be0535c 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_grain_to_date
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query against a grain_to_date cumulative metric.
+sql_engine: DuckDB
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
index 6cadf9002..00b30cf11 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_ds
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a cumulative metric with no time dimension specified.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0_optimized.sql
index 09fc4701f..fe5ae4dfb 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_ds
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a cumulative metric with no time dimension specified.
+sql_engine: DuckDB
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
index 4d5124983..2858278cb 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query where there is a windowless cumulative metric to compute.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0_optimized.sql
index eeb3c39cb..9772de01a 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query where there is a windowless cumulative metric to compute.
+sql_engine: DuckDB
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 1d643c014..c85b6a5dc 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window_with_time_constraint
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a windowless cumulative metric query with an adjustable time constraint.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
index d00190e85..0d9509c20 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window_with_time_constraint
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a windowless cumulative metric query with an adjustable time constraint.
+sql_engine: DuckDB
 ---
 -- Join Self Over Time Range
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-01T00:00:00]
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
index b9ba5d864..92ba7ad81 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_and_metric_time
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with one agg time dimension and one metric time dimension.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
index c1d486c15..605f338e6 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_and_metric_time
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with one agg time dimension and one metric time dimension.
+sql_engine: DuckDB
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'metric_time__day', 'revenue_instance__ds__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_dimension__plan0.sql
index 4f1d81820..d5f86fb9b 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_dimension
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with agg time dimension.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
index 529ab8726..4e6e8838d 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_dimension
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with agg time dimension.
+sql_engine: DuckDB
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'revenue_instance__ds__day']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
index 0e172a1b4..cd33a8bae 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_agg_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple agg time dimensions.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
index b0cdcb3a4..bea2d2499 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_agg_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple agg time dimensions.
+sql_engine: DuckDB
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'revenue_instance__ds__day', 'revenue_instance__ds__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
index a4a1c66fa..978845887 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_metric_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple metric time dimensions.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
index 4afdeeb9e..658471c48 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_metric_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple metric time dimensions.
+sql_engine: DuckDB
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'metric_time__day', 'metric_time__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
index cb2ec13b9..300e47568 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric. When we do not have an adjustable time filter we must include all
       input data in order to ensure the cumulative metric is correct.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
index 177a1bf68..d79ded883 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric. When we do not have an adjustable time filter we must include all
       input data in order to ensure the cumulative metric is correct.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_default_grain__plan0.sql
index b51176713..45d1761dd 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grain.
+sql_engine: DuckDB
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
index 45e77ce63..e0c42e08b 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grain.
+sql_engine: DuckDB
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
index dddb4020e..3de21854a 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric, but when we receive a time constraint filter expression we can
       automatically adjust it should render a query similar to this one.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
index 5d8fb99f5..e7f9872fc 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric, but when we receive a time constraint filter expression we can
       automatically adjust it should render a query similar to this one.
+sql_engine: DuckDB
 ---
 -- Join Self Over Time Range
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-01T00:00:00]
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_cumulative_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
index 26da53913..7aafd6767 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_derived_cumulative_metric_with_non_default_grains
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Test querying a derived metric with a cumulative input metric using non-default grains.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
index 50b3747f2..547cf232b 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_derived_cumulative_metric_with_non_default_grains
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Test querying a derived metric with a cumulative input metric using non-default grains.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grain__plan0.sql
index aaf462644..54b21cd97 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_grain_to_date_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grain.
+sql_engine: DuckDB
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
index 284878999..5817e9a14 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_grain_to_date_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grain.
+sql_engine: DuckDB
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grains__plan0.sql
index 8160652a4..9367d0ab3 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grains.
 
       Uses agg time dimension instead of metric_time. Excludes default grain.
+sql_engine: DuckDB
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
index 01775c564..0e92dd688 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grains.
 
       Uses agg time dimension instead of metric_time. Excludes default grain.
+sql_engine: DuckDB
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grain__plan0.sql
index b3a4ffea0..e51efccea 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_window_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grain.
+sql_engine: DuckDB
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grain__plan0_optimized.sql
index b7789174e..60e2472cf 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_window_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grain.
+sql_engine: DuckDB
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grains__plan0.sql
index 299d44d34..59e5ddc36 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grains.
 
       Uses both metric_time and agg_time_dimension. Excludes default grain.
+sql_engine: DuckDB
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grains__plan0_optimized.sql
index 6b0af06e5..bcfdbe9aa 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/DuckDB/test_window_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grains.
 
       Uses both metric_time and agg_time_dimension. Excludes default grain.
+sql_engine: DuckDB
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_all_time_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_all_time_metric_with_non_default_grains__plan0.sql
index 0d6633fb6..12caed19c 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_all_time_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_all_time_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grains.
 
       Uses only metric_time. Excludes default grain.
+sql_engine: Postgres
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_all_time_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
index 7819f94d9..358a521f1 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grains.
 
       Uses only metric_time. Excludes default grain.
+sql_engine: Postgres
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql
index 3633d1de1..36e0900ef 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a basic cumulative metric query.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0_optimized.sql
index 05c62e60b..a43a317c5 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a basic cumulative metric query.
+sql_engine: Postgres
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
index 14113cbd4..4b9b2bdae 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_grain_to_date
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query against a grain_to_date cumulative metric.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0_optimized.sql
index dc3cd87a0..240873a4a 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_grain_to_date
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query against a grain_to_date cumulative metric.
+sql_engine: Postgres
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
index 6cadf9002..cdd92ac57 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_ds
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a cumulative metric with no time dimension specified.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0_optimized.sql
index 09fc4701f..9ab123cab 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_ds
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a cumulative metric with no time dimension specified.
+sql_engine: Postgres
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
index 4d5124983..393c6f185 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query where there is a windowless cumulative metric to compute.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0_optimized.sql
index eeb3c39cb..c4ea7ef55 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query where there is a windowless cumulative metric to compute.
+sql_engine: Postgres
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 1d643c014..81c9582d5 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window_with_time_constraint
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a windowless cumulative metric query with an adjustable time constraint.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
index d00190e85..52556bd10 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window_with_time_constraint
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a windowless cumulative metric query with an adjustable time constraint.
+sql_engine: Postgres
 ---
 -- Join Self Over Time Range
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-01T00:00:00]
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
index ef231266f..e3d8bb840 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_and_metric_time
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with one agg time dimension and one metric time dimension.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
index 3cc7adf3e..1dbaf428d 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_and_metric_time
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with one agg time dimension and one metric time dimension.
+sql_engine: Postgres
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'metric_time__day', 'revenue_instance__ds__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_dimension__plan0.sql
index da3612a71..94bdc69cc 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_dimension
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with agg time dimension.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
index 1b5df5715..795017b3c 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_dimension
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with agg time dimension.
+sql_engine: Postgres
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'revenue_instance__ds__day']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
index ae7b94558..04d7310b3 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_agg_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple agg time dimensions.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
index 621e08384..51b4d4f6a 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_agg_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple agg time dimensions.
+sql_engine: Postgres
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'revenue_instance__ds__day', 'revenue_instance__ds__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
index b9acbd45a..b372f354d 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_metric_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple metric time dimensions.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
index 758cde3d4..95180868d 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_metric_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple metric time dimensions.
+sql_engine: Postgres
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'metric_time__day', 'metric_time__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
index c5390c8a7..eb5a64360 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric. When we do not have an adjustable time filter we must include all
       input data in order to ensure the cumulative metric is correct.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
index 5cb3ae251..767bb3511 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric. When we do not have an adjustable time filter we must include all
       input data in order to ensure the cumulative metric is correct.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_default_grain__plan0.sql
index b51176713..e489a4dfc 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grain.
+sql_engine: Postgres
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
index 45e77ce63..434c039c8 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grain.
+sql_engine: Postgres
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
index 862090596..513b8371f 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric, but when we receive a time constraint filter expression we can
       automatically adjust it should render a query similar to this one.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
index 2ffb6051a..f532dc1b2 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric, but when we receive a time constraint filter expression we can
       automatically adjust it should render a query similar to this one.
+sql_engine: Postgres
 ---
 -- Join Self Over Time Range
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-01T00:00:00]
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_cumulative_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
index a1e822bb7..d550c0c87 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_derived_cumulative_metric_with_non_default_grains
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Test querying a derived metric with a cumulative input metric using non-default grains.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
index a2cfc1266..d43053690 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_derived_cumulative_metric_with_non_default_grains
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Test querying a derived metric with a cumulative input metric using non-default grains.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grain__plan0.sql
index aaf462644..dbe86861a 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_grain_to_date_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grain.
+sql_engine: Postgres
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
index 284878999..c1af01568 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_grain_to_date_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grain.
+sql_engine: Postgres
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grains__plan0.sql
index 8160652a4..2fc0d4a68 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grains.
 
       Uses agg time dimension instead of metric_time. Excludes default grain.
+sql_engine: Postgres
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
index 01775c564..4ff83d1ae 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grains.
 
       Uses agg time dimension instead of metric_time. Excludes default grain.
+sql_engine: Postgres
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grain__plan0.sql
index 95171e511..21d582b59 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_window_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grain.
+sql_engine: Postgres
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grain__plan0_optimized.sql
index ec1a2d801..2aec36f06 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_window_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grain.
+sql_engine: Postgres
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grains__plan0.sql
index da630d130..440e5837e 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grains.
 
       Uses both metric_time and agg_time_dimension. Excludes default grain.
+sql_engine: Postgres
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grains__plan0_optimized.sql
index c29d012a4..08450420e 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Postgres/test_window_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grains.
 
       Uses both metric_time and agg_time_dimension. Excludes default grain.
+sql_engine: Postgres
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_all_time_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_all_time_metric_with_non_default_grains__plan0.sql
index a6b464318..4c7da43d5 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_all_time_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_all_time_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grains.
 
       Uses only metric_time. Excludes default grain.
+sql_engine: Redshift
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_all_time_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
index 7819f94d9..ef4f1bf07 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grains.
 
       Uses only metric_time. Excludes default grain.
+sql_engine: Redshift
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql
index 51effbe22..e397a0071 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a basic cumulative metric query.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0_optimized.sql
index 05c62e60b..d78469137 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a basic cumulative metric query.
+sql_engine: Redshift
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
index eeccc3d9b..cf1e52da6 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_grain_to_date
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query against a grain_to_date cumulative metric.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0_optimized.sql
index dc3cd87a0..d52959c13 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_grain_to_date
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query against a grain_to_date cumulative metric.
+sql_engine: Redshift
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
index 05321cc68..1222f1c56 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_ds
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a cumulative metric with no time dimension specified.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0_optimized.sql
index 09fc4701f..c243a933b 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_ds
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a cumulative metric with no time dimension specified.
+sql_engine: Redshift
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
index 17a4a3356..a4ce5a3da 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query where there is a windowless cumulative metric to compute.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0_optimized.sql
index eeb3c39cb..853b0d78b 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query where there is a windowless cumulative metric to compute.
+sql_engine: Redshift
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 6c485b744..20d48b6e7 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window_with_time_constraint
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a windowless cumulative metric query with an adjustable time constraint.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
index d00190e85..a77bac065 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window_with_time_constraint
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a windowless cumulative metric query with an adjustable time constraint.
+sql_engine: Redshift
 ---
 -- Join Self Over Time Range
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-01T00:00:00]
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
index 481385daa..ee6b9d541 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_and_metric_time
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with one agg time dimension and one metric time dimension.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
index 23058246a..c693f0775 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_and_metric_time
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with one agg time dimension and one metric time dimension.
+sql_engine: Redshift
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'metric_time__day', 'revenue_instance__ds__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_dimension__plan0.sql
index 08697de51..12cd9de39 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_dimension
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with agg time dimension.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
index ea7822777..f192bcfbe 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_dimension
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with agg time dimension.
+sql_engine: Redshift
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'revenue_instance__ds__day']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
index 0abdf03ad..bded409e5 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_agg_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple agg time dimensions.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
index f1cf8e85b..cb70817bd 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_agg_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple agg time dimensions.
+sql_engine: Redshift
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'revenue_instance__ds__day', 'revenue_instance__ds__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
index 344017966..a98161dc4 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_metric_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple metric time dimensions.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
index 1e00823a9..af6c3d1b2 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_metric_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple metric time dimensions.
+sql_engine: Redshift
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'metric_time__day', 'metric_time__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
index 312b3ce6b..2f0d8b4c2 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric. When we do not have an adjustable time filter we must include all
       input data in order to ensure the cumulative metric is correct.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
index 93c8da88c..8afda5a4b 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric. When we do not have an adjustable time filter we must include all
       input data in order to ensure the cumulative metric is correct.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_default_grain__plan0.sql
index df0c2f8ae..ff28a731b 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grain.
+sql_engine: Redshift
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
index 45e77ce63..a044ab72c 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grain.
+sql_engine: Redshift
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
index 8bf9164b3..19dac6f66 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric, but when we receive a time constraint filter expression we can
       automatically adjust it should render a query similar to this one.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
index c59c01ed8..6c5221865 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric, but when we receive a time constraint filter expression we can
       automatically adjust it should render a query similar to this one.
+sql_engine: Redshift
 ---
 -- Join Self Over Time Range
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-01T00:00:00]
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_cumulative_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
index 69d8a1e37..2332acc1e 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_derived_cumulative_metric_with_non_default_grains
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Test querying a derived metric with a cumulative input metric using non-default grains.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
index bc88b14a1..d0ce2c8ec 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_derived_cumulative_metric_with_non_default_grains
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Test querying a derived metric with a cumulative input metric using non-default grains.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grain__plan0.sql
index d514e9536..913b88e34 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_grain_to_date_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grain.
+sql_engine: Redshift
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
index 284878999..219c63446 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_grain_to_date_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grain.
+sql_engine: Redshift
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grains__plan0.sql
index 8da8ed870..1b37705b2 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grains.
 
       Uses agg time dimension instead of metric_time. Excludes default grain.
+sql_engine: Redshift
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
index 01775c564..35c7b1e6c 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grains.
 
       Uses agg time dimension instead of metric_time. Excludes default grain.
+sql_engine: Redshift
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grain__plan0.sql
index 5a6c264f2..f57aaf98d 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_window_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grain.
+sql_engine: Redshift
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grain__plan0_optimized.sql
index 93de1954f..89dfd9920 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_window_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grain.
+sql_engine: Redshift
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grains__plan0.sql
index cc07c8295..a94d9c967 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grains.
 
       Uses both metric_time and agg_time_dimension. Excludes default grain.
+sql_engine: Redshift
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grains__plan0_optimized.sql
index c5ce42a77..faffe28b1 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Redshift/test_window_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grains.
 
       Uses both metric_time and agg_time_dimension. Excludes default grain.
+sql_engine: Redshift
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_all_time_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_all_time_metric_with_non_default_grains__plan0.sql
index 8b390d4dc..3325d811e 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_all_time_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_all_time_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grains.
 
       Uses only metric_time. Excludes default grain.
+sql_engine: Snowflake
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_all_time_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
index 7819f94d9..bd1f973e2 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grains.
 
       Uses only metric_time. Excludes default grain.
+sql_engine: Snowflake
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql
index 028689f2f..0b6ddb74e 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a basic cumulative metric query.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0_optimized.sql
index 05c62e60b..3ceea2c39 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a basic cumulative metric query.
+sql_engine: Snowflake
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
index 640836310..cc71d2d86 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_grain_to_date
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query against a grain_to_date cumulative metric.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0_optimized.sql
index dc3cd87a0..08c9f6f21 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_grain_to_date
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query against a grain_to_date cumulative metric.
+sql_engine: Snowflake
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
index 0f0c50e94..48858a35a 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_ds
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a cumulative metric with no time dimension specified.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0_optimized.sql
index 09fc4701f..b67d63019 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_ds
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a cumulative metric with no time dimension specified.
+sql_engine: Snowflake
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
index e8393c8df..fe6f7bba6 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query where there is a windowless cumulative metric to compute.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0_optimized.sql
index eeb3c39cb..a30843290 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query where there is a windowless cumulative metric to compute.
+sql_engine: Snowflake
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 1c867f44f..e95535ec4 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window_with_time_constraint
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a windowless cumulative metric query with an adjustable time constraint.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
index d00190e85..649b7f416 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window_with_time_constraint
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a windowless cumulative metric query with an adjustable time constraint.
+sql_engine: Snowflake
 ---
 -- Join Self Over Time Range
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-01T00:00:00]
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
index 4fe475cef..34d8bd25e 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_and_metric_time
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with one agg time dimension and one metric time dimension.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
index 23058246a..10517fce1 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_and_metric_time
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with one agg time dimension and one metric time dimension.
+sql_engine: Snowflake
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'metric_time__day', 'revenue_instance__ds__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_dimension__plan0.sql
index 127e4d21d..0b53b7e19 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_dimension
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with agg time dimension.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
index ea7822777..0b934f0ed 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_dimension
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with agg time dimension.
+sql_engine: Snowflake
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'revenue_instance__ds__day']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
index 17a0bfff7..baecd5b30 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_agg_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple agg time dimensions.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
index f1cf8e85b..67a4ef8be 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_agg_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple agg time dimensions.
+sql_engine: Snowflake
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'revenue_instance__ds__day', 'revenue_instance__ds__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
index 323a7870a..bc38d52b6 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_metric_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple metric time dimensions.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
index 1e00823a9..3ace47f9a 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_metric_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple metric time dimensions.
+sql_engine: Snowflake
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'metric_time__day', 'metric_time__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
index 9a8468a59..7b3e74a0b 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric. When we do not have an adjustable time filter we must include all
       input data in order to ensure the cumulative metric is correct.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
index 93c8da88c..763928839 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric. When we do not have an adjustable time filter we must include all
       input data in order to ensure the cumulative metric is correct.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_default_grain__plan0.sql
index d55939f6d..ad807641e 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grain.
+sql_engine: Snowflake
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
index 45e77ce63..d7c666286 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grain.
+sql_engine: Snowflake
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
index d8e3c21e8..8beb2f626 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric, but when we receive a time constraint filter expression we can
       automatically adjust it should render a query similar to this one.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
index c59c01ed8..136050edb 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric, but when we receive a time constraint filter expression we can
       automatically adjust it should render a query similar to this one.
+sql_engine: Snowflake
 ---
 -- Join Self Over Time Range
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-01T00:00:00]
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_cumulative_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
index 85621e460..27dabd93c 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_derived_cumulative_metric_with_non_default_grains
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Test querying a derived metric with a cumulative input metric using non-default grains.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
index bc88b14a1..b0eac1b40 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_derived_cumulative_metric_with_non_default_grains
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Test querying a derived metric with a cumulative input metric using non-default grains.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grain__plan0.sql
index 10f7f81e5..5f2ec24a9 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_grain_to_date_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grain.
+sql_engine: Snowflake
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
index 284878999..f9407ae48 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_grain_to_date_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grain.
+sql_engine: Snowflake
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grains__plan0.sql
index 35998d352..3b77012ba 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grains.
 
       Uses agg time dimension instead of metric_time. Excludes default grain.
+sql_engine: Snowflake
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
index 01775c564..59b59b15b 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grains.
 
       Uses agg time dimension instead of metric_time. Excludes default grain.
+sql_engine: Snowflake
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grain__plan0.sql
index f60e1aa86..8bb5379de 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_window_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grain.
+sql_engine: Snowflake
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grain__plan0_optimized.sql
index 93de1954f..d3bd05e7c 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_window_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grain.
+sql_engine: Snowflake
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grains__plan0.sql
index 92799c82e..f07cc9121 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grains.
 
       Uses both metric_time and agg_time_dimension. Excludes default grain.
+sql_engine: Snowflake
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grains__plan0_optimized.sql
index c5ce42a77..a8be656ab 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Snowflake/test_window_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grains.
 
       Uses both metric_time and agg_time_dimension. Excludes default grain.
+sql_engine: Snowflake
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_all_time_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_all_time_metric_with_non_default_grains__plan0.sql
index c5e488717..3498c8067 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_all_time_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_all_time_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grains.
 
       Uses only metric_time. Excludes default grain.
+sql_engine: Trino
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_all_time_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
index 7819f94d9..b79d44083 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grains.
 
       Uses only metric_time. Excludes default grain.
+sql_engine: Trino
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric__plan0.sql
index cbdf568f7..98adf428e 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a basic cumulative metric query.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric__plan0_optimized.sql
index 05c62e60b..359700239 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a basic cumulative metric query.
+sql_engine: Trino
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_grain_to_date__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_grain_to_date__plan0.sql
index a9138d331..95474bc5b 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_grain_to_date__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_grain_to_date
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query against a grain_to_date cumulative metric.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_grain_to_date__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_grain_to_date__plan0_optimized.sql
index dc3cd87a0..3d8a16098 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_grain_to_date__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_grain_to_date__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_grain_to_date
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query against a grain_to_date cumulative metric.
+sql_engine: Trino
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_ds__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_ds__plan0.sql
index f958adfb9..be537cebc 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_ds__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_ds__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_ds
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a cumulative metric with no time dimension specified.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_ds__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_ds__plan0_optimized.sql
index 09fc4701f..9870f8202 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_ds__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_ds__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_ds
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a cumulative metric with no time dimension specified.
+sql_engine: Trino
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window__plan0.sql
index 53435c35c..15f75759d 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query where there is a windowless cumulative metric to compute.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window__plan0_optimized.sql
index eeb3c39cb..473edd8a7 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query where there is a windowless cumulative metric to compute.
+sql_engine: Trino
 ---
 -- Read Elements From Semantic Model 'revenue'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index d296ec454..857e9a21d 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window_with_time_constraint
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a windowless cumulative metric query with an adjustable time constraint.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
index 67f13db99..258474dd8 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_no_window_with_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_no_window_with_time_constraint
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a windowless cumulative metric query with an adjustable time constraint.
+sql_engine: Trino
 ---
 -- Join Self Over Time Range
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-01T00:00:00]
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
index 23063d300..d43fe522c 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_and_metric_time
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with one agg time dimension and one metric time dimension.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
index 93604b49f..2507c338d 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_and_metric_time
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with one agg time dimension and one metric time dimension.
+sql_engine: Trino
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'metric_time__day', 'revenue_instance__ds__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_dimension__plan0.sql
index 950701f51..a7bb8ad17 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_dimension
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with agg time dimension.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
index 52931707e..b00ecae38 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_agg_time_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_agg_time_dimension
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with agg time dimension.
+sql_engine: Trino
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'revenue_instance__ds__day']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
index a6f9e1c22..a8f9ba652 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_agg_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple agg time dimensions.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
index c1185a7f4..418d4de7d 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_agg_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple agg time dimensions.
+sql_engine: Trino
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'revenue_instance__ds__day', 'revenue_instance__ds__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
index 61d7688df..5b8d79b00 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_metric_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple metric time dimensions.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
index d27e424ea..c561d87b8 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_multiple_metric_time_dimensions
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative metric queried with multiple metric time dimensions.
+sql_engine: Trino
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['txn_revenue', 'metric_time__day', 'metric_time__month']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
index 93d8b4138..f2c6b4872 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_adjustable_time_filter__plan0.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric. When we do not have an adjustable time filter we must include all
       input data in order to ensure the cumulative metric is correct.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
index 61ea39cbb..1a3482d91 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_adjustable_time_filter__plan0_optimized.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric. When we do not have an adjustable time filter we must include all
       input data in order to ensure the cumulative metric is correct.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_default_grain__plan0.sql
index 75461c436..06f59d17a 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grain.
+sql_engine: Trino
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
index 45e77ce63..1f3801e17 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_cumulative_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative all-time metric queried with non-default grain.
+sql_engine: Trino
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_time_constraint__plan0.sql
index 941e46b5e..caf6365fd 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric, but when we receive a time constraint filter expression we can
       automatically adjust it should render a query similar to this one.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
index 0ebb53905..970d5ffce 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_time_constraint__plan0_optimized.sql
@@ -6,6 +6,7 @@ docstring:
       Not all query inputs with time constraint filters allow us to adjust the time constraint to include the full
       span of input data for a cumulative metric, but when we receive a time constraint filter expression we can
       automatically adjust it should render a query similar to this one.
+sql_engine: Trino
 ---
 -- Join Self Over Time Range
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-01T00:00:00]
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_derived_cumulative_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
index 091068932..d9ee31ba3 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_derived_cumulative_metric_with_non_default_grains
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Test querying a derived metric with a cumulative input metric using non-default grains.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
index c32b80354..f5070e701 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_derived_cumulative_metric_with_non_default_grains
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Test querying a derived metric with a cumulative input metric using non-default grains.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grain__plan0.sql
index 3531ad841..5b28658fc 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_grain_to_date_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grain.
+sql_engine: Trino
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
index 284878999..96968d0b0 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_grain_to_date_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grain.
+sql_engine: Trino
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grains__plan0.sql
index 75be8094e..c882d16f8 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grains.
 
       Uses agg time dimension instead of metric_time. Excludes default grain.
+sql_engine: Trino
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
index 01775c564..114514b87 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative grain to date metric queried with non-default grains.
 
       Uses agg time dimension instead of metric_time. Excludes default grain.
+sql_engine: Trino
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grain__plan0.sql
index dce9104ef..585c8461f 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_window_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grain.
+sql_engine: Trino
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grain__plan0_optimized.sql
index 51a417b9c..caea2f507 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_window_metric_with_non_default_grain
 test_filename: test_cumulative_metric_rendering.py
 docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grain.
+sql_engine: Trino
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grains__plan0.sql
index 4cc8d5dac..5a85b8a6d 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grains__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grains.
 
       Uses both metric_time and agg_time_dimension. Excludes default grain.
+sql_engine: Trino
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grains__plan0_optimized.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grains__plan0_optimized.sql
index be601579e..2787373c0 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grains__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlQueryPlan/Trino/test_window_metric_with_non_default_grains__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query for a cumulative window metric queried with non-default grains.
 
       Uses both metric_time and agg_time_dimension. Excludes default grain.
+sql_engine: Trino
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0.sql
index f725260e6..1ec3b8785 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
index 0845e754a..dccedd25c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0.sql
index 77f74609a..f2b76c14d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
index 0432d642d..7e266c111 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index ab0ca187b..f2e38456f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index a81adf357..56e848edc 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0.sql
index 6849e97a1..e3f4ab547 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
index a2c8198c2..cfdb2c0b1 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0.sql
index 951f4444d..b4d50aefd 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0_optimized.sql
index 5f1b32150..5608d1dfa 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
index a50d5ba70..6083cf5c3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_metric_grouped_by_custom_grain
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
index f11f90cf9..62966cf59 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_metric_grouped_by_custom_grain
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index b716fbd56..4637ac3bf 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index 28fcaedf7..c0ebc93ad 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0.sql
index b221ae3f0..3617e3fb4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
index 6a7287420..ec57d54bf 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 7c5fcaccb..5f174e122 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index 6b018d35a..0ab8123cd 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0.sql
index de7c31517..4964605ca 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['metric_time__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
index ed9f88d08..c79e24f13 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0.sql
index 8a2f2d13a..3ab38adab 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['booking__ds__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
index 4839fa171..57462f569 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0.sql
index f9f6eeb73..3cb0bbb6b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['listing__ds__day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
index 4c2044342..60e82e71f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__ds__day',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 66947a03a..f336caa0a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['listing__ds__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index ce247796e..cc7117855 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__ds__martian_day',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0.sql
index 2e6c62e68..944c04ae2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0_optimized.sql
index 9729d5a22..ac6a6b216 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 2a18fddf9..c0581a4f2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index f093c0f26..4239dbf28 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0.sql
index 2eea05080..53f0bd34a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0_optimized.sql
index 5c2a9e772..b8fcf6f3c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0.sql
index 5cf2449b6..47fed26d3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity_and_join
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
index 14f532198..d38b813c2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity_and_join
 test_filename: test_custom_granularity.py
+sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0.sql
index 147d3b5af..eae5c5cf1 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
index 20f303a1e..f1c626574 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 9bf23cdda..7d8909b7a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index 029aa9fbb..5f5f4307a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
index 7192e2c19..8df3108b5 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_multi_hop_custom_granularity
 test_filename: test_custom_granularity.py
 docstring:
   Test simple metric with a multi hop dimension and custom grain.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
index 0edff138f..a1b60afb2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_multi_hop_custom_granularity
 test_filename: test_custom_granularity.py
 docstring:
   Test simple metric with a multi hop dimension and custom grain.
+sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0.sql
index 8a9c724e0..a83d81375 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
index 6e6237f85..aecd6a32c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0.sql
index 6614464e8..0191498f4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
index 94b9ee3e3..076645232 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 139ff3161..bc1e9e47b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 70ef7eee0..ebf7f2251 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0.sql
index 4dfb81b76..b16b882f8 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
index 5083638fb..87f0e4ab6 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_derived_metric_with_custom_granularity__plan0.sql
index ff40f5fcb..b93acdb37 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_derived_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_derived_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_derived_metric_with_custom_granularity__plan0_optimized.sql
index 291ffa6f5..33b3c5091 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_derived_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_derived_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
index a8b73b2a4..7940136a8 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_metric_grouped_by_custom_grain
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
index c5fdcfc11..d6bd37494 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_metric_grouped_by_custom_grain
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 3c9298572..3a8cce1f6 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index 9a4fa054f..d3bf024cc 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0.sql
index 7e1e5e90a..3ef9569c6 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
index e67f5c390..38f2bc748 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index d7451ddee..426ac5643 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index e11e6a878..91a4d3a5c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0.sql
index 7db745858..80584bf31 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['metric_time__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
index 42bc30855..510f4fce1 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0.sql
index 177a091e5..6a59a9098 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['booking__ds__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
index 73e96c218..389d077a2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0.sql
index 9e172881b..053e40c05 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['listing__ds__day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
index 967bfd289..77f73c3d0 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__ds__day',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 8995fc42f..0d418144c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['listing__ds__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index ee15867d3..d69e14480 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__ds__martian_day',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity__plan0.sql
index 60d4b2166..21cbbc82f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity__plan0_optimized.sql
index c964b3165..cc3c8aeff 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index b2948e9c1..672b0c3c3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index a067aa9f7..e4cb94adb 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity__plan0.sql
index 45bcfc5fd..77b3c357d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity__plan0_optimized.sql
index 0ee1f90d6..6e4c1a521 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0.sql
index 2719b9100..9292b214b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity_and_join
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
index 18fe09909..cef16d9ba 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity_and_join
 test_filename: test_custom_granularity.py
+sql_engine: Databricks
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0.sql
index fae460520..745f7c064 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
index 5d5f3a507..2e5704b20 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 938cb0a46..eb10d51d0 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index f21b64dae..11c994006 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
index 5e8f6fd2f..32ae051fd 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_multi_hop_custom_granularity
 test_filename: test_custom_granularity.py
 docstring:
   Test simple metric with a multi hop dimension and custom grain.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
index b608ef817..171b6b17c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_multi_hop_custom_granularity
 test_filename: test_custom_granularity.py
 docstring:
   Test simple metric with a multi hop dimension and custom grain.
+sql_engine: Databricks
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0.sql
index 3870c819a..2fd1b887c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
index 67e2bba00..ba175e642 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0.sql
index 57f5e1a54..35481ddb4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
index c52ecf281..088cf85f8 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 53de07abc..712e6681d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 1f9b50dbc..f99e5bafd 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0.sql
index 82042a988..70b956113 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
index 4aa690a7d..b6d3d325f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0.sql
index a2dfaabf8..fa95f7e2a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0_optimized.sql
index 291ffa6f5..090fed233 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
index 229a3afc1..3a8410cac 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_metric_grouped_by_custom_grain
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
index c5fdcfc11..4b8a0f426 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_metric_grouped_by_custom_grain
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index d92b1c497..cbb2a4303 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index 9a4fa054f..cefe78b9c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0.sql
index ee6315490..f736fcd0b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
index e67f5c390..21cbf2586 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 45d63b1ee..740795eb7 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index e11e6a878..022d8736c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0.sql
index 141aa6fe8..617786a90 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['metric_time__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
index 42bc30855..3d4ff1f12 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0.sql
index 72513e67c..e6c062e75 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['booking__ds__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
index 73e96c218..fceb97373 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0.sql
index 4ef5844e1..0b27f8714 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['listing__ds__day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
index 967bfd289..36cabda1d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__ds__day',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 1cbe2f51f..499fa8cb0 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['listing__ds__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index ee15867d3..9640f1d51 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__ds__martian_day',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0.sql
index e71daf37c..dab0635e8 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0_optimized.sql
index 160f371d0..9b358e093 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 1a9320f76..4c9d86d58 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index ca56bb167..a74e4042e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0.sql
index 2e673976b..bbe0d8f70 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0_optimized.sql
index 0ee1f90d6..ef0649aa2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0.sql
index 3d385af20..1de44cb95 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity_and_join
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
index 18fe09909..ff8a72e79 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity_and_join
 test_filename: test_custom_granularity.py
+sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0.sql
index 16aed43cd..99803ca49 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
index 5d5f3a507..831db32cb 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 767754d8e..6fc64e76d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index f21b64dae..8f24de69d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
index b2ce5a6cd..face17e25 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_multi_hop_custom_granularity
 test_filename: test_custom_granularity.py
 docstring:
   Test simple metric with a multi hop dimension and custom grain.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
index b608ef817..eaf84be05 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_multi_hop_custom_granularity
 test_filename: test_custom_granularity.py
 docstring:
   Test simple metric with a multi hop dimension and custom grain.
+sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0.sql
index 0a7a37ad5..5b2d4416e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
index c22230fda..a8813e342 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0.sql
index 57fdc67ad..2091455f5 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
index 575fd0f88..6bd7e45ce 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 35f606eb2..a32bda6ff 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index f6a9e3c99..6a96a50f2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0.sql
index e3f5cd14a..733ea9f82 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
index 70f7674ff..ed8ca3e0b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_derived_metric_with_custom_granularity__plan0.sql
index a2dfaabf8..f7b61ce13 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_derived_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_derived_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_derived_metric_with_custom_granularity__plan0_optimized.sql
index 291ffa6f5..22a163a26 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_derived_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_derived_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
index 229a3afc1..642690d3f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_metric_grouped_by_custom_grain
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
index c5fdcfc11..a9b787e1a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_metric_grouped_by_custom_grain
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index d92b1c497..4b7a758e9 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index 9a4fa054f..b3c67297a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0.sql
index ee6315490..90bad40cf 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
index e67f5c390..88f0d5e65 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 45d63b1ee..ba2608207 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index e11e6a878..f456f17c1 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0.sql
index 141aa6fe8..3f5875f03 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['metric_time__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
index 42bc30855..f881ddc13 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0.sql
index 72513e67c..b16d7c73d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['booking__ds__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
index 73e96c218..f890eccfc 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0.sql
index 4ef5844e1..f5a032a0b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['listing__ds__day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
index 967bfd289..315768f36 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__ds__day',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 1cbe2f51f..31eaedc6e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['listing__ds__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index ee15867d3..f8d5598ea 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__ds__martian_day',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity__plan0.sql
index 2b5f37ba0..5b948cbb8 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity__plan0_optimized.sql
index 2909f93db..1a03d0f71 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 5d7e527ff..34f0c3329 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 4f9181897..e5cb95f9b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity__plan0.sql
index 2e673976b..73f430277 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity__plan0_optimized.sql
index 0ee1f90d6..dab1643ed 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0.sql
index 3d385af20..3d92e453e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity_and_join
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
index 18fe09909..3dfb93b42 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity_and_join
 test_filename: test_custom_granularity.py
+sql_engine: Postgres
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0.sql
index 16aed43cd..b8cd46b9a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
index 5d5f3a507..9cac5a5d7 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 767754d8e..b1607d6bd 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index f21b64dae..ad69272ff 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
index b2ce5a6cd..80329b10c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_multi_hop_custom_granularity
 test_filename: test_custom_granularity.py
 docstring:
   Test simple metric with a multi hop dimension and custom grain.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
index b608ef817..36373ff77 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_multi_hop_custom_granularity
 test_filename: test_custom_granularity.py
 docstring:
   Test simple metric with a multi hop dimension and custom grain.
+sql_engine: Postgres
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0.sql
index 9e395ec02..d005eac8b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
index 4fedb3de2..366016372 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0.sql
index 94265783d..a0d30c5dc 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
index 9772af70c..1b2724f6a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 3fa2945c0..036a6febe 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 3b9ed0713..bd9509728 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0.sql
index c58f7269f..8dc800f2e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
index 5083638fb..d18212972 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_derived_metric_with_custom_granularity__plan0.sql
index 52faa7266..691c59175 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_derived_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_derived_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_derived_metric_with_custom_granularity__plan0_optimized.sql
index 291ffa6f5..0faeff60b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_derived_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_derived_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
index 9a7192965..94980d052 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_metric_grouped_by_custom_grain
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
index c5fdcfc11..117d947a3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_metric_grouped_by_custom_grain
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 5d9ac41f9..9526fb753 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index 9a4fa054f..56d2c8ed1 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0.sql
index 9dc525184..b569186b7 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
index e67f5c390..1c8b925d2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 7549c69af..04cd7b1a6 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index e11e6a878..4448310b1 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0.sql
index 33ab31a91..0187b6f35 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['metric_time__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
index 42bc30855..302c60ffb 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0.sql
index da079acc2..4af0ff1e2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['booking__ds__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
index 73e96c218..971e2e8e1 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0.sql
index a24044428..c28abb2dd 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['listing__ds__day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
index 967bfd289..e83f8d537 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__ds__day',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
index eaee60939..10842592f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['listing__ds__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index ee15867d3..6c4f83493 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__ds__martian_day',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity__plan0.sql
index a0f0d02f8..b3c8a539a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity__plan0_optimized.sql
index c964b3165..70b91bc6a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 070a94df0..770f90b5c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index a067aa9f7..40e9bafc5 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity__plan0.sql
index 2da3e077c..b8dc3840d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity__plan0_optimized.sql
index 0ee1f90d6..fb59951fa 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0.sql
index 4f888f453..b02c6fe69 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity_and_join
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
index 18fe09909..689370821 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity_and_join
 test_filename: test_custom_granularity.py
+sql_engine: Redshift
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0.sql
index a4428ca99..91a1741fd 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
index 5d5f3a507..616a3908d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 3ba4b38dd..6c3ae5e85 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index f21b64dae..d4f5eb3f7 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
index 65dc54bcc..0f4364003 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_multi_hop_custom_granularity
 test_filename: test_custom_granularity.py
 docstring:
   Test simple metric with a multi hop dimension and custom grain.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
index b608ef817..d4b8a633f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_multi_hop_custom_granularity
 test_filename: test_custom_granularity.py
 docstring:
   Test simple metric with a multi hop dimension and custom grain.
+sql_engine: Redshift
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0.sql
index 018bd5a98..a9f9f0213 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
index 3c4064b5b..23f0537f5 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0.sql
index 5bcc35c51..d72ed4643 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
index d8c531b05..48872ab22 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 6f720ef21..a373d2ff4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index d628b5d1f..13137479d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0.sql
index a35ca0e1b..a8b8d66d9 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
index 5083638fb..5a01ab40e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0.sql
index ac3b63c4a..2e0ed87f7 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0_optimized.sql
index 291ffa6f5..dadf4178a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
index f558fb78e..b6417abdf 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_metric_grouped_by_custom_grain
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
index c5fdcfc11..a12e68fc8 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_metric_grouped_by_custom_grain
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 9db3fc28f..4295ce8ef 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index 9a4fa054f..9c76f5486 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0.sql
index 75174f7e7..a7fc48e87 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
index e67f5c390..d4164aaf0 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index c1a3d317e..11f74861d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index e11e6a878..961e69d45 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0.sql
index 4eda0edf0..23a71f942 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['metric_time__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
index 42bc30855..407b07dfa 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0.sql
index 5c9656b42..418503997 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['booking__ds__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
index 73e96c218..79bcd5ec2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0.sql
index 084d112fc..74eec90ab 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['listing__ds__day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
index 967bfd289..7266f223e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__ds__day',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 3570c4bc7..8bd2d4bb9 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['listing__ds__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index ee15867d3..271956f1a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__ds__martian_day',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0.sql
index 90c452795..2d27633c4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0_optimized.sql
index c964b3165..8d106e868 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 4ae584870..c9b3f8ab3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index a067aa9f7..e86c0510f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0.sql
index a5b40cf99..1f2f82377 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0_optimized.sql
index 0ee1f90d6..0f7a70285 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0.sql
index f3bcb5236..3e456ee85 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity_and_join
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
index 18fe09909..2a7ee6c6e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity_and_join
 test_filename: test_custom_granularity.py
+sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0.sql
index a2c304876..8eecd83b4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
index 5d5f3a507..1fb764d2f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 823c4b061..5362d1284 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index f21b64dae..24ae4b3b8 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
index e30cb4a81..ef12310f2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_multi_hop_custom_granularity
 test_filename: test_custom_granularity.py
 docstring:
   Test simple metric with a multi hop dimension and custom grain.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
index b608ef817..cd1a99682 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_multi_hop_custom_granularity
 test_filename: test_custom_granularity.py
 docstring:
   Test simple metric with a multi hop dimension and custom grain.
+sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity__plan0.sql
index 9a9cbbf6e..5b4a53ae6 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
index 8dcca8b39..63df6179e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0.sql
index b779ddae5..302770ba1 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
index 886403427..82d806535 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 799fb7d1d..7a4e55907 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 12418498c..c78099b55 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_conversion_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0.sql
index 79369869d..5d994761c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
index fe4f924a5..814e7974d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Re-aggregate Metric via Group By
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_derived_metric_with_custom_granularity__plan0.sql
index b09544100..69d1165a9 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_derived_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_derived_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_derived_metric_with_custom_granularity__plan0_optimized.sql
index 291ffa6f5..0396ee400 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_derived_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_derived_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
index 8469d512f..d546ea6a6 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_metric_grouped_by_custom_grain
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
index c5fdcfc11..da3aa2f15 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_metric_grouped_by_custom_grain
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 62c02b1ea..51b217d1d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index 9a4fa054f..04ee9b07f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0.sql
index 3f7d75cc8..a4f017f2c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
index e67f5c390..8f00e938d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 23024f40b..53cb3d73a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index e11e6a878..3af119502 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0.sql
index 8f1cd333b..2cffd5ff3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['metric_time__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
index 42bc30855..abe4c357b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0.sql
index c333e3aad..220ed52ff 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['booking__ds__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
index 73e96c218..f2f3bf03c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0.sql
index c6a32e9c5..4f7056fb3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['listing__ds__day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
index 967bfd289..b2b43ca2b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__ds__day',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 0b7997c3e..20a13743a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['listing__ds__martian_day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index ee15867d3..3a7a67a58 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_no_metrics_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__ds__martian_day',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity__plan0.sql
index e5da0bfe8..b1acbbb39 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity__plan0_optimized.sql
index 868995c86..4ab73ec73 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 7d8cfc8c6..fb29efa35 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 9c7b3fb14..2ed4e1008 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_metric_with_custom_granularity_filter_not_in_group_by
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity__plan0.sql
index ac07bcaa2..589709109 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity__plan0_optimized.sql
index 0ee1f90d6..a60a41a75 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0.sql
index b5671cea3..612f490d5 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity_and_join
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
index 18fe09909..3109487bc 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_custom_granularity_and_join
 test_filename: test_custom_granularity.py
+sql_engine: Trino
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0.sql
index dee94d6b6..cd4828678 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
index 5d5f3a507..f2dcb2666 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_filter
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is not used in the group by.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings',]
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 0ff871dbf..5ca21d66f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index f21b64dae..b9f9272a3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_custom_granularity_in_filter_and_group_by
 test_filename: test_custom_granularity.py
 docstring:
   Simple metric queried with a filter on a custom grain, where that grain is also used in the group by.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
index 9fd79d8c1..e33984602 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_multi_hop_custom_granularity
 test_filename: test_custom_granularity.py
 docstring:
   Test simple metric with a multi hop dimension and custom grain.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
index b608ef817..0790d437e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_metric_with_multi_hop_custom_granularity
 test_filename: test_custom_granularity.py
 docstring:
   Test simple metric with a multi hop dimension and custom grain.
+sql_engine: Trino
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
diff --git a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/BigQuery/test_build_metric_tasks__query0.sql b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/BigQuery/test_build_metric_tasks__query0.sql
index 6d2fa9c8d..ac46dbf3f 100644
--- a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/BigQuery/test_build_metric_tasks__query0.sql
+++ b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/BigQuery/test_build_metric_tasks__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_build_metric_tasks
 test_filename: test_data_warehouse_tasks.py
+sql_engine: BigQuery
 ---
 SELECT
   metric_time__day
diff --git a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/BigQuery/test_build_saved_query_tasks__query0.sql b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/BigQuery/test_build_saved_query_tasks__query0.sql
index c34c9646e..f8805aa1c 100644
--- a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/BigQuery/test_build_saved_query_tasks__query0.sql
+++ b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/BigQuery/test_build_saved_query_tasks__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_build_saved_query_tasks
 test_filename: test_data_warehouse_tasks.py
+sql_engine: BigQuery
 ---
 SELECT
   metric_time__day
diff --git a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Databricks/test_build_metric_tasks__query0.sql b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Databricks/test_build_metric_tasks__query0.sql
index e654ef0a6..df361cea6 100644
--- a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Databricks/test_build_metric_tasks__query0.sql
+++ b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Databricks/test_build_metric_tasks__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_build_metric_tasks
 test_filename: test_data_warehouse_tasks.py
+sql_engine: Databricks
 ---
 SELECT
   metric_time__day
diff --git a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Databricks/test_build_saved_query_tasks__query0.sql b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Databricks/test_build_saved_query_tasks__query0.sql
index ef605803b..a00988856 100644
--- a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Databricks/test_build_saved_query_tasks__query0.sql
+++ b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Databricks/test_build_saved_query_tasks__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_build_saved_query_tasks
 test_filename: test_data_warehouse_tasks.py
+sql_engine: Databricks
 ---
 SELECT
   metric_time__day
diff --git a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/DuckDB/test_build_metric_tasks__query0.sql b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/DuckDB/test_build_metric_tasks__query0.sql
index e654ef0a6..1a03e81aa 100644
--- a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/DuckDB/test_build_metric_tasks__query0.sql
+++ b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/DuckDB/test_build_metric_tasks__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_build_metric_tasks
 test_filename: test_data_warehouse_tasks.py
+sql_engine: DuckDB
 ---
 SELECT
   metric_time__day
diff --git a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/DuckDB/test_build_saved_query_tasks__query0.sql b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/DuckDB/test_build_saved_query_tasks__query0.sql
index ef605803b..4ee5ebf64 100644
--- a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/DuckDB/test_build_saved_query_tasks__query0.sql
+++ b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/DuckDB/test_build_saved_query_tasks__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_build_saved_query_tasks
 test_filename: test_data_warehouse_tasks.py
+sql_engine: DuckDB
 ---
 SELECT
   metric_time__day
diff --git a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Postgres/test_build_metric_tasks__query0.sql b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Postgres/test_build_metric_tasks__query0.sql
index e654ef0a6..11956b457 100644
--- a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Postgres/test_build_metric_tasks__query0.sql
+++ b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Postgres/test_build_metric_tasks__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_build_metric_tasks
 test_filename: test_data_warehouse_tasks.py
+sql_engine: Postgres
 ---
 SELECT
   metric_time__day
diff --git a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Postgres/test_build_saved_query_tasks__query0.sql b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Postgres/test_build_saved_query_tasks__query0.sql
index ef605803b..aabb21210 100644
--- a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Postgres/test_build_saved_query_tasks__query0.sql
+++ b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Postgres/test_build_saved_query_tasks__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_build_saved_query_tasks
 test_filename: test_data_warehouse_tasks.py
+sql_engine: Postgres
 ---
 SELECT
   metric_time__day
diff --git a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Redshift/test_build_metric_tasks__query0.sql b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Redshift/test_build_metric_tasks__query0.sql
index e654ef0a6..9696f49f8 100644
--- a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Redshift/test_build_metric_tasks__query0.sql
+++ b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Redshift/test_build_metric_tasks__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_build_metric_tasks
 test_filename: test_data_warehouse_tasks.py
+sql_engine: Redshift
 ---
 SELECT
   metric_time__day
diff --git a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Redshift/test_build_saved_query_tasks__query0.sql b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Redshift/test_build_saved_query_tasks__query0.sql
index ef605803b..b8e5c23a2 100644
--- a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Redshift/test_build_saved_query_tasks__query0.sql
+++ b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Redshift/test_build_saved_query_tasks__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_build_saved_query_tasks
 test_filename: test_data_warehouse_tasks.py
+sql_engine: Redshift
 ---
 SELECT
   metric_time__day
diff --git a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Snowflake/test_build_metric_tasks__query0.sql b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Snowflake/test_build_metric_tasks__query0.sql
index e654ef0a6..c5d32c021 100644
--- a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Snowflake/test_build_metric_tasks__query0.sql
+++ b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Snowflake/test_build_metric_tasks__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_build_metric_tasks
 test_filename: test_data_warehouse_tasks.py
+sql_engine: Snowflake
 ---
 SELECT
   metric_time__day
diff --git a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Snowflake/test_build_saved_query_tasks__query0.sql b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Snowflake/test_build_saved_query_tasks__query0.sql
index ef605803b..432f0a485 100644
--- a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Snowflake/test_build_saved_query_tasks__query0.sql
+++ b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Snowflake/test_build_saved_query_tasks__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_build_saved_query_tasks
 test_filename: test_data_warehouse_tasks.py
+sql_engine: Snowflake
 ---
 SELECT
   metric_time__day
diff --git a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Trino/test_build_metric_tasks__query0.sql b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Trino/test_build_metric_tasks__query0.sql
index e654ef0a6..e577f6342 100644
--- a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Trino/test_build_metric_tasks__query0.sql
+++ b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Trino/test_build_metric_tasks__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_build_metric_tasks
 test_filename: test_data_warehouse_tasks.py
+sql_engine: Trino
 ---
 SELECT
   metric_time__day
diff --git a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Trino/test_build_saved_query_tasks__query0.sql b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Trino/test_build_saved_query_tasks__query0.sql
index ef605803b..50cbe77f6 100644
--- a/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Trino/test_build_saved_query_tasks__query0.sql
+++ b/tests_metricflow/snapshots/test_data_warehouse_tasks.py/str/Trino/test_build_saved_query_tasks__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_build_saved_query_tasks
 test_filename: test_data_warehouse_tasks.py
+sql_engine: Trino
 ---
 SELECT
   metric_time__day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_combine_output_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_combine_output_node__plan0.sql
index e2679b8b2..5e0b63845 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_combine_output_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_combine_output_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_combine_output_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests combining AggregateMeasuresNode.
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_combine_output_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_combine_output_node__plan0_optimized.sql
index d8f917377..af7158814 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_combine_output_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_combine_output_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_combine_output_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests combining AggregateMeasuresNode.
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql
index c39563d1d..e0e02fb69 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0_optimized.sql
index a093e35ee..8038020c9 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 -- Aggregate Measures
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 17e804864..9c1f27010 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_multiple_semantic_models
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the combine metrics node for ratio type metrics.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
index 578cd7448..03e5630df 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_multiple_semantic_models
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the combine metrics node for ratio type metrics.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index a9a8e3b42..4dc0b5311 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_single_semantic_model
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for ratio type metrics sourced from a single semantic model.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
index d3e404388..044550415 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_single_semantic_model
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for ratio type metrics sourced from a single semantic model.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql
index 47f095b38..4814dd666 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_simple_expr
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for expr type metrics sourced from a single measure.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0_optimized.sql
index c17196505..d938f5652 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_simple_expr
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for expr type metrics sourced from a single measure.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql
index bb18eac32..917ae9fef 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_constrain_time_range_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting the ConstrainTimeRangeNode to SQL.
+sql_engine: BigQuery
 ---
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-02T00:00:00]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0_optimized.sql
index fbd801f99..39d1328f5 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_constrain_time_range_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting the ConstrainTimeRangeNode to SQL.
+sql_engine: BigQuery
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings', 'ds__day']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimension_with_joined_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimension_with_joined_where_constraint__plan0.sql
index 6dc0cf675..e93c937f3 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimension_with_joined_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimension_with_joined_where_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_with_joined_where_constraint
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['user__home_state_latest',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimension_with_joined_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimension_with_joined_where_constraint__plan0_optimized.sql
index a454bd953..68ee56276 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimension_with_joined_where_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimension_with_joined_where_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_with_joined_where_constraint
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['user__home_state_latest',]
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0.sql
index c4eb1521a..0305eb113 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0_optimized.sql
index 354340738..11f0901e8 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql
index 3e3dbf623..db985e30d 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['bookings',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0_optimized.sql
index 6bd8bbc9b..69d3bc30a 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: BigQuery
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings',]
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql
index e11fffd62..5b73630e6 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0_optimized.sql
index 08050e5a8..a26feaee0 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 58ba0c7cc..df5ee089a 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_to_grain
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
+sql_engine: BigQuery
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
index 797b06050..7f016e0fc 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_to_grain
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
+sql_engine: BigQuery
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 73d0cce24..6c071baeb 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_window
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: BigQuery
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
index 236303915..56a681a48 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_window
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: BigQuery
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql
index 6c69599d4..b522cde69 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_without_offset
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: BigQuery
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
index 70ad32831..cc87b4581 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_without_offset
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: BigQuery
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql
index b5d285384..d33719a31 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf measure aggregation node.
 
       Covers SUM, AVERAGE, SUM_BOOLEAN (transformed to SUM upstream), and COUNT_DISTINCT agg types
+sql_engine: BigQuery
 ---
 -- Aggregate Measures
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0_optimized.sql
index 8e65d6dca..fcc584d66 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf measure aggregation node.
 
       Covers SUM, AVERAGE, SUM_BOOLEAN (transformed to SUM upstream), and COUNT_DISTINCT agg types
+sql_engine: BigQuery
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings', 'instant_bookings', 'average_booking_value', 'bookers']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql
index 2c9c81a5a..7a0419a8e 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0_optimized.sql
index fe3abca27..22f65187f 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql
index 96c25d360..af7ef808a 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_order_by_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: BigQuery
 ---
 -- Order By ['ds__day', 'bookings']
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0_optimized.sql
index 6814348fc..65e5f071a 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_order_by_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: BigQuery
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql
index 910fa9062..9bfbd0bd8 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: BigQuery
 ---
 -- Join on MIN(ds) and [] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql
index 66e84521b..b50d8e027 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: BigQuery
 ---
 -- Join on MIN(ds) and [] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql
index 9d895f411..75cecf8c9 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_grouping
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode with a window_grouping.
+sql_engine: BigQuery
 ---
 -- Join on MAX(ds) and ['user'] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index 90c6d39ac..1fc05f413 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_grouping
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode with a window_grouping.
+sql_engine: BigQuery
 ---
 -- Join on MAX(ds) and ['user'] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index 96baad3f0..9df251d90 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_queried_group_by
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: BigQuery
 ---
 -- Join on MIN(ds) and [] grouping by ds
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index d4f4f7f99..8ad27a98a 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_queried_group_by
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: BigQuery
 ---
 -- Join on MIN(ds) and [] grouping by ds
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql
index 9d43394ec..994b9bd16 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_single_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 1 dimension.
+sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0_optimized.sql
index 38534197c..158b6b601 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_single_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 1 dimension.
+sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql
index 4398a8899..67c9dc4e8 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_source_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a single source node.
+sql_engine: BigQuery
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql
index 65fa39be3..8cb3cf6f9 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_source_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a single source node.
+sql_engine: BigQuery
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_combine_output_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_combine_output_node__plan0.sql
index 855a14871..f4fd7da9f 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_combine_output_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_combine_output_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_combine_output_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests combining AggregateMeasuresNode.
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_combine_output_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_combine_output_node__plan0_optimized.sql
index 83d03d0be..c0bc19891 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_combine_output_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_combine_output_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_combine_output_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests combining AggregateMeasuresNode.
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0.sql
index fb7c00172..7edfa8e88 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0_optimized.sql
index a543654e5..12e38989d 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Databricks
 ---
 -- Join Standard Outputs
 -- Aggregate Measures
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 305700ba3..09731ba7a 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_multiple_semantic_models
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the combine metrics node for ratio type metrics.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
index 506dcc51b..d0c28be01 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_multiple_semantic_models
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the combine metrics node for ratio type metrics.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index 86d2f9133..1b515f96f 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_single_semantic_model
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for ratio type metrics sourced from a single semantic model.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
index d52a1a63d..0df76adc7 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_single_semantic_model
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for ratio type metrics sourced from a single semantic model.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0.sql
index e5b74b607..a47a2951c 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_simple_expr
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for expr type metrics sourced from a single measure.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0_optimized.sql
index af791bf49..7030069ae 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_simple_expr
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for expr type metrics sourced from a single measure.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0.sql
index 26eea75d5..a768f9532 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_constrain_time_range_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting the ConstrainTimeRangeNode to SQL.
+sql_engine: Databricks
 ---
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-02T00:00:00]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0_optimized.sql
index 600c81b84..4611c5ae7 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_constrain_time_range_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting the ConstrainTimeRangeNode to SQL.
+sql_engine: Databricks
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings', 'ds__day']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimension_with_joined_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimension_with_joined_where_constraint__plan0.sql
index 823455761..4939b56fe 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimension_with_joined_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimension_with_joined_where_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_with_joined_where_constraint
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['user__home_state_latest',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimension_with_joined_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimension_with_joined_where_constraint__plan0_optimized.sql
index a454bd953..770e91b86 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimension_with_joined_where_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimension_with_joined_where_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_with_joined_where_constraint
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['user__home_state_latest',]
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0.sql
index 231b37bd3..a52088000 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0_optimized.sql
index 53dc07a0e..92cda4d01 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Databricks
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0.sql
index 7e49da432..29d55aee2 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['bookings',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0_optimized.sql
index 6bd8bbc9b..55d11dc22 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Databricks
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings',]
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0.sql
index 88fb5d31e..645dbc2ca 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0_optimized.sql
index 87d2298a5..cfd12a504 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index e856600e9..f3ca5b121 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_to_grain
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
+sql_engine: Databricks
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
index 9bce24c2d..86a352b04 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_to_grain
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
+sql_engine: Databricks
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 08da3fda2..1e5621698 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_window
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Databricks
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
index 70d6b89f2..9526bf446 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_window
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Databricks
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql
index 2a7fd2710..72e47dfe9 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_without_offset
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Databricks
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
index 0af2dc3a8..26a322f7c 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_without_offset
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Databricks
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0.sql
index 9d0236a9b..b6dfb22be 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf measure aggregation node.
 
       Covers SUM, AVERAGE, SUM_BOOLEAN (transformed to SUM upstream), and COUNT_DISTINCT agg types
+sql_engine: Databricks
 ---
 -- Aggregate Measures
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0_optimized.sql
index 8e65d6dca..0e5dcdf84 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf measure aggregation node.
 
       Covers SUM, AVERAGE, SUM_BOOLEAN (transformed to SUM upstream), and COUNT_DISTINCT agg types
+sql_engine: Databricks
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings', 'instant_bookings', 'average_booking_value', 'bookers']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0.sql
index 7cb0ed483..bbbb70a92 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Databricks
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0_optimized.sql
index fe3abca27..6fc50e372 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Databricks
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0.sql
index 6d2d362b1..b5067579a 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_order_by_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Databricks
 ---
 -- Order By ['ds__day', 'bookings']
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0_optimized.sql
index 15e0abb64..4c7091bd9 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_order_by_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Databricks
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0.sql
index ab8eb29be..fe94ba551 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Databricks
 ---
 -- Join on MIN(ds) and [] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0_optimized.sql
index 3cff4f8fc..452ac5306 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Databricks
 ---
 -- Join on MIN(ds) and [] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0.sql
index 1c00af0ef..9e18ea752 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_grouping
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode with a window_grouping.
+sql_engine: Databricks
 ---
 -- Join on MAX(ds) and ['user'] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index da74312e8..d43c7815a 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_grouping
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode with a window_grouping.
+sql_engine: Databricks
 ---
 -- Join on MAX(ds) and ['user'] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index 8d5197e01..78442efc3 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_queried_group_by
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Databricks
 ---
 -- Join on MIN(ds) and [] grouping by ds
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index 787ad91d1..6a99ca2e4 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_queried_group_by
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Databricks
 ---
 -- Join on MIN(ds) and [] grouping by ds
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0.sql
index e678b7dcc..2aaf5f9cd 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_single_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 1 dimension.
+sql_engine: Databricks
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0_optimized.sql
index 38534197c..fb98dad99 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_single_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 1 dimension.
+sql_engine: Databricks
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0.sql
index f1c946a18..d9ff46389 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_source_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a single source node.
+sql_engine: Databricks
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0_optimized.sql
index 57ee40403..34fec291c 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_source_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a single source node.
+sql_engine: Databricks
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_combine_output_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_combine_output_node__plan0.sql
index 4f04d2cf9..bf643de8b 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_combine_output_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_combine_output_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_combine_output_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests combining AggregateMeasuresNode.
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_combine_output_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_combine_output_node__plan0_optimized.sql
index 83d03d0be..6188d8c5f 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_combine_output_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_combine_output_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_combine_output_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests combining AggregateMeasuresNode.
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql
index 2bf52d3d7..ec68c6e3a 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0_optimized.sql
index a543654e5..9d8d99e31 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 -- Aggregate Measures
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 0376e681a..3a6062017 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_multiple_semantic_models
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the combine metrics node for ratio type metrics.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
index 506dcc51b..4159b2cec 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_multiple_semantic_models
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the combine metrics node for ratio type metrics.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index 1cebfede2..848fc882b 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_single_semantic_model
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for ratio type metrics sourced from a single semantic model.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
index d52a1a63d..d566adae6 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_single_semantic_model
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for ratio type metrics sourced from a single semantic model.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql
index d19b81335..8085e948a 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_simple_expr
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for expr type metrics sourced from a single measure.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0_optimized.sql
index af791bf49..60995d078 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_simple_expr
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for expr type metrics sourced from a single measure.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql
index 77dd345a8..b53c416fd 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_constrain_time_range_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting the ConstrainTimeRangeNode to SQL.
+sql_engine: DuckDB
 ---
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-02T00:00:00]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0_optimized.sql
index 600c81b84..fbedf20ed 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_constrain_time_range_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting the ConstrainTimeRangeNode to SQL.
+sql_engine: DuckDB
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings', 'ds__day']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimension_with_joined_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimension_with_joined_where_constraint__plan0.sql
index 6857dcddc..6a8a99511 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimension_with_joined_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimension_with_joined_where_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_with_joined_where_constraint
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['user__home_state_latest',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimension_with_joined_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimension_with_joined_where_constraint__plan0_optimized.sql
index a454bd953..e4c2687c1 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimension_with_joined_where_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimension_with_joined_where_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_with_joined_where_constraint
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['user__home_state_latest',]
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0.sql
index 66567062b..67558d25b 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0_optimized.sql
index 53dc07a0e..9e89b4700 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql
index 8dffb6ba1..40c1450b7 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['bookings',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0_optimized.sql
index 6bd8bbc9b..a65d9bc56 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: DuckDB
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings',]
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql
index 2b95e5683..1700bd1a4 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0_optimized.sql
index 87d2298a5..069186a5a 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 5421e3ac1..88328484c 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_to_grain
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
+sql_engine: DuckDB
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
index 9bce24c2d..98b19b46b 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_to_grain
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
+sql_engine: DuckDB
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 617f26c36..7df8eb307 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_window
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: DuckDB
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
index 2955fcd4d..294e95b37 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_window
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: DuckDB
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql
index 5c9c3e21a..ea69ffa7f 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_without_offset
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: DuckDB
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
index 0af2dc3a8..14aa3b807 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_without_offset
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: DuckDB
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql
index 02998773b..a88d0f5fe 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf measure aggregation node.
 
       Covers SUM, AVERAGE, SUM_BOOLEAN (transformed to SUM upstream), and COUNT_DISTINCT agg types
+sql_engine: DuckDB
 ---
 -- Aggregate Measures
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0_optimized.sql
index 8e65d6dca..5c9407f9e 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf measure aggregation node.
 
       Covers SUM, AVERAGE, SUM_BOOLEAN (transformed to SUM upstream), and COUNT_DISTINCT agg types
+sql_engine: DuckDB
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings', 'instant_bookings', 'average_booking_value', 'bookers']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql
index bb0b2e217..16d0c36be 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0_optimized.sql
index fe3abca27..451fcb54d 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql
index c75c1d367..c69a2995d 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_order_by_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: DuckDB
 ---
 -- Order By ['ds__day', 'bookings']
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0_optimized.sql
index 15e0abb64..25752fcff 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_order_by_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: DuckDB
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql
index a6f7ba2a9..f72ed63fa 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: DuckDB
 ---
 -- Join on MIN(ds) and [] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql
index 39162b1fc..7055e49a3 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: DuckDB
 ---
 -- Join on MIN(ds) and [] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql
index d89f0536b..82cdc345b 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_grouping
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode with a window_grouping.
+sql_engine: DuckDB
 ---
 -- Join on MAX(ds) and ['user'] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index de11b69d4..c3fccc73e 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_grouping
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode with a window_grouping.
+sql_engine: DuckDB
 ---
 -- Join on MAX(ds) and ['user'] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index d2d9b3d58..6ce6708cc 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_queried_group_by
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: DuckDB
 ---
 -- Join on MIN(ds) and [] grouping by ds
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index 75e650b99..7b5e27d89 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_queried_group_by
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: DuckDB
 ---
 -- Join on MIN(ds) and [] grouping by ds
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql
index c4a6fd006..bf3edf518 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_single_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 1 dimension.
+sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0_optimized.sql
index 38534197c..8026e2da0 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_single_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 1 dimension.
+sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql
index a9460f89f..b1d659e53 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_source_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a single source node.
+sql_engine: DuckDB
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql
index 8dfd8533b..a273522df 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_source_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a single source node.
+sql_engine: DuckDB
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_combine_output_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_combine_output_node__plan0.sql
index 4f04d2cf9..12b4d8884 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_combine_output_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_combine_output_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_combine_output_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests combining AggregateMeasuresNode.
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_combine_output_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_combine_output_node__plan0_optimized.sql
index 83d03d0be..983f8f1d1 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_combine_output_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_combine_output_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_combine_output_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests combining AggregateMeasuresNode.
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0.sql
index 2bf52d3d7..661ec1398 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0_optimized.sql
index a543654e5..b0a55fdd1 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Postgres
 ---
 -- Join Standard Outputs
 -- Aggregate Measures
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 5debbb321..ca6ccdb21 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_multiple_semantic_models
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the combine metrics node for ratio type metrics.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
index 53c3ae9ad..9a15a293f 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_multiple_semantic_models
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the combine metrics node for ratio type metrics.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index 9674dc1eb..6375ab059 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_single_semantic_model
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for ratio type metrics sourced from a single semantic model.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
index a2181a946..f70049de1 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_single_semantic_model
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for ratio type metrics sourced from a single semantic model.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0.sql
index d19b81335..359cc270d 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_simple_expr
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for expr type metrics sourced from a single measure.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0_optimized.sql
index af791bf49..f4caa9e99 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_simple_expr
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for expr type metrics sourced from a single measure.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0.sql
index 77dd345a8..8e39e522d 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_constrain_time_range_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting the ConstrainTimeRangeNode to SQL.
+sql_engine: Postgres
 ---
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-02T00:00:00]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0_optimized.sql
index 600c81b84..5c570f727 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_constrain_time_range_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting the ConstrainTimeRangeNode to SQL.
+sql_engine: Postgres
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings', 'ds__day']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimension_with_joined_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimension_with_joined_where_constraint__plan0.sql
index 6857dcddc..268cc033b 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimension_with_joined_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimension_with_joined_where_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_with_joined_where_constraint
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['user__home_state_latest',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimension_with_joined_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimension_with_joined_where_constraint__plan0_optimized.sql
index a454bd953..45114dc08 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimension_with_joined_where_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimension_with_joined_where_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_with_joined_where_constraint
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['user__home_state_latest',]
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0.sql
index 66567062b..ddaee25ae 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0_optimized.sql
index 53dc07a0e..cba5ed8df 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Postgres
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0.sql
index 8dffb6ba1..963e5daba 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['bookings',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0_optimized.sql
index 6bd8bbc9b..473dda7c6 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Postgres
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings',]
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0.sql
index 2b95e5683..816409736 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0_optimized.sql
index 87d2298a5..808df5f2d 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 5421e3ac1..99dbae8a8 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_to_grain
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
+sql_engine: Postgres
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
index 9bce24c2d..9338b356c 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_to_grain
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
+sql_engine: Postgres
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 304631e13..39dc0b493 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_window
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Postgres
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
index 72bc46fbe..a12c69618 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_window
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Postgres
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql
index 5c9c3e21a..0d6fe3cdc 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_without_offset
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Postgres
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
index 0af2dc3a8..84faaff6c 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_without_offset
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Postgres
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0.sql
index 02998773b..75b3fa1c1 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf measure aggregation node.
 
       Covers SUM, AVERAGE, SUM_BOOLEAN (transformed to SUM upstream), and COUNT_DISTINCT agg types
+sql_engine: Postgres
 ---
 -- Aggregate Measures
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0_optimized.sql
index 8e65d6dca..d9882b309 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf measure aggregation node.
 
       Covers SUM, AVERAGE, SUM_BOOLEAN (transformed to SUM upstream), and COUNT_DISTINCT agg types
+sql_engine: Postgres
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings', 'instant_bookings', 'average_booking_value', 'bookers']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0.sql
index bb0b2e217..7741bdb90 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Postgres
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0_optimized.sql
index fe3abca27..7ba2d4392 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Postgres
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0.sql
index c75c1d367..accda0fcb 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_order_by_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Postgres
 ---
 -- Order By ['ds__day', 'bookings']
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0_optimized.sql
index 15e0abb64..c21337ef4 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_order_by_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Postgres
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0.sql
index a6f7ba2a9..1d5f12de7 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Postgres
 ---
 -- Join on MIN(ds) and [] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0_optimized.sql
index 39162b1fc..3c237fd4f 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Postgres
 ---
 -- Join on MIN(ds) and [] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0.sql
index d89f0536b..c3e120452 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_grouping
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode with a window_grouping.
+sql_engine: Postgres
 ---
 -- Join on MAX(ds) and ['user'] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index de11b69d4..177e0dd7b 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_grouping
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode with a window_grouping.
+sql_engine: Postgres
 ---
 -- Join on MAX(ds) and ['user'] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index d2d9b3d58..407aaf1d9 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_queried_group_by
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Postgres
 ---
 -- Join on MIN(ds) and [] grouping by ds
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index 75e650b99..10365578d 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_queried_group_by
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Postgres
 ---
 -- Join on MIN(ds) and [] grouping by ds
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0.sql
index c4a6fd006..99cff80de 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_single_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 1 dimension.
+sql_engine: Postgres
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0_optimized.sql
index 38534197c..ca86a8835 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_single_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 1 dimension.
+sql_engine: Postgres
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0.sql
index a9460f89f..ace5b1454 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_source_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a single source node.
+sql_engine: Postgres
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0_optimized.sql
index 8dfd8533b..fa6f71727 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_source_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a single source node.
+sql_engine: Postgres
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_combine_output_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_combine_output_node__plan0.sql
index 06af7637d..ecdf7b208 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_combine_output_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_combine_output_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_combine_output_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests combining AggregateMeasuresNode.
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_combine_output_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_combine_output_node__plan0_optimized.sql
index 83d03d0be..59cf853e5 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_combine_output_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_combine_output_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_combine_output_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests combining AggregateMeasuresNode.
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0.sql
index c5f6999fe..d98a31be9 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0_optimized.sql
index a543654e5..0c0328556 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Redshift
 ---
 -- Join Standard Outputs
 -- Aggregate Measures
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 95f77c974..f10b7adfd 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_multiple_semantic_models
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the combine metrics node for ratio type metrics.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
index 53c3ae9ad..1d695a61a 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_multiple_semantic_models
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the combine metrics node for ratio type metrics.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index cd75d4d04..7a378ec10 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_single_semantic_model
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for ratio type metrics sourced from a single semantic model.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
index a2181a946..8c584d472 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_single_semantic_model
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for ratio type metrics sourced from a single semantic model.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0.sql
index 6cd6c67c9..47454ccba 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_simple_expr
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for expr type metrics sourced from a single measure.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0_optimized.sql
index af791bf49..8ef3028b4 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_simple_expr
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for expr type metrics sourced from a single measure.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0.sql
index 2bd8c04df..974e07715 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_constrain_time_range_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting the ConstrainTimeRangeNode to SQL.
+sql_engine: Redshift
 ---
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-02T00:00:00]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0_optimized.sql
index 600c81b84..aefa30dfa 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_constrain_time_range_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting the ConstrainTimeRangeNode to SQL.
+sql_engine: Redshift
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings', 'ds__day']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimension_with_joined_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimension_with_joined_where_constraint__plan0.sql
index 82ab0fb61..536d391d5 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimension_with_joined_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimension_with_joined_where_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_with_joined_where_constraint
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['user__home_state_latest',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimension_with_joined_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimension_with_joined_where_constraint__plan0_optimized.sql
index a454bd953..5da14b218 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimension_with_joined_where_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimension_with_joined_where_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_with_joined_where_constraint
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['user__home_state_latest',]
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0.sql
index b1d5525c4..dc656f269 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0_optimized.sql
index 53dc07a0e..b52a7ec61 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Redshift
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0.sql
index 4eac2f80f..c636be313 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['bookings',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0_optimized.sql
index 6bd8bbc9b..d4cde282d 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Redshift
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings',]
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0.sql
index 1e52118f4..29257bfcb 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0_optimized.sql
index 87d2298a5..b574a5dc4 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 5aec38dc9..61968b773 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_to_grain
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
+sql_engine: Redshift
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
index 9bce24c2d..3bb9abc84 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_to_grain
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
+sql_engine: Redshift
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 638831d7b..68c8a5df8 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_window
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Redshift
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
index 70d6b89f2..2f03b29d3 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_window
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Redshift
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql
index c663063d2..bf808c4cb 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_without_offset
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Redshift
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
index 0af2dc3a8..a6a075543 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_without_offset
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Redshift
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0.sql
index a7579620a..6792b3380 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf measure aggregation node.
 
       Covers SUM, AVERAGE, SUM_BOOLEAN (transformed to SUM upstream), and COUNT_DISTINCT agg types
+sql_engine: Redshift
 ---
 -- Aggregate Measures
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0_optimized.sql
index 8e65d6dca..bdab25b24 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf measure aggregation node.
 
       Covers SUM, AVERAGE, SUM_BOOLEAN (transformed to SUM upstream), and COUNT_DISTINCT agg types
+sql_engine: Redshift
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings', 'instant_bookings', 'average_booking_value', 'bookers']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0.sql
index 66d6a8ab9..dea4fd0ba 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Redshift
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0_optimized.sql
index fe3abca27..e83e60d3e 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Redshift
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0.sql
index 347c41438..71c45aa99 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_order_by_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Redshift
 ---
 -- Order By ['ds__day', 'bookings']
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0_optimized.sql
index 15e0abb64..33d93de10 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_order_by_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Redshift
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0.sql
index f4ee437c2..f8222deef 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Redshift
 ---
 -- Join on MIN(ds) and [] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0_optimized.sql
index c7d10e2a2..0b97c72ae 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Redshift
 ---
 -- Join on MIN(ds) and [] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0.sql
index 4bee6774a..16760ffb5 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_grouping
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode with a window_grouping.
+sql_engine: Redshift
 ---
 -- Join on MAX(ds) and ['user'] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index 1f519d72f..25e268dde 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_grouping
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode with a window_grouping.
+sql_engine: Redshift
 ---
 -- Join on MAX(ds) and ['user'] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index 0b9609ee4..c20e61a48 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_queried_group_by
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Redshift
 ---
 -- Join on MIN(ds) and [] grouping by ds
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index 99b5aee44..c776c3996 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_queried_group_by
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Redshift
 ---
 -- Join on MIN(ds) and [] grouping by ds
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0.sql
index a8c08f5f8..c1882ec90 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_single_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 1 dimension.
+sql_engine: Redshift
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0_optimized.sql
index 38534197c..6d77c41b3 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_single_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 1 dimension.
+sql_engine: Redshift
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0.sql
index d0dd72b67..b672f7490 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_source_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a single source node.
+sql_engine: Redshift
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0_optimized.sql
index 8f42e0e94..e96e3df59 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_source_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a single source node.
+sql_engine: Redshift
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_combine_output_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_combine_output_node__plan0.sql
index cfc4cf0f1..57a1eff45 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_combine_output_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_combine_output_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_combine_output_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests combining AggregateMeasuresNode.
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_combine_output_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_combine_output_node__plan0_optimized.sql
index 83d03d0be..476ce6aea 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_combine_output_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_combine_output_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_combine_output_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests combining AggregateMeasuresNode.
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0.sql
index 3a9087bf0..f1a647b53 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0_optimized.sql
index a543654e5..2931d58a0 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 -- Aggregate Measures
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 6205be9e3..67f6a6c62 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_multiple_semantic_models
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the combine metrics node for ratio type metrics.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
index 506dcc51b..4ecf068dc 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_multiple_semantic_models
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the combine metrics node for ratio type metrics.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index 442f12186..aaf63029a 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_single_semantic_model
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for ratio type metrics sourced from a single semantic model.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
index d52a1a63d..c712b613b 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_single_semantic_model
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for ratio type metrics sourced from a single semantic model.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0.sql
index 40d8ffbc2..00e167aed 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_simple_expr
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for expr type metrics sourced from a single measure.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0_optimized.sql
index af791bf49..19905ec1d 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_simple_expr
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for expr type metrics sourced from a single measure.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0.sql
index 6298cbfc7..68ac4e88c 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_constrain_time_range_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting the ConstrainTimeRangeNode to SQL.
+sql_engine: Snowflake
 ---
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-02T00:00:00]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0_optimized.sql
index 600c81b84..51d5e5524 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_constrain_time_range_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting the ConstrainTimeRangeNode to SQL.
+sql_engine: Snowflake
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings', 'ds__day']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimension_with_joined_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimension_with_joined_where_constraint__plan0.sql
index f9a152ab5..115dd4d5f 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimension_with_joined_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimension_with_joined_where_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_with_joined_where_constraint
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['user__home_state_latest',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimension_with_joined_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimension_with_joined_where_constraint__plan0_optimized.sql
index a454bd953..b1867efb1 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimension_with_joined_where_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimension_with_joined_where_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_with_joined_where_constraint
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['user__home_state_latest',]
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0.sql
index 4f41cf840..280ae1836 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0_optimized.sql
index 53dc07a0e..e8c35696e 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0.sql
index 2613efab4..6df4731c7 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['bookings',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0_optimized.sql
index 6bd8bbc9b..280d47568 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Snowflake
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings',]
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0.sql
index 93669e8e4..aa2a3e949 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0_optimized.sql
index 87d2298a5..d4c22a773 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 281abbbfa..af914e612 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_to_grain
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
+sql_engine: Snowflake
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
index 9bce24c2d..c0df8e738 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_to_grain
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
+sql_engine: Snowflake
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 978640e18..37fbd8649 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_window
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Snowflake
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
index 70d6b89f2..6b1d20340 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_window
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Snowflake
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql
index 63e546013..15522cdfd 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_without_offset
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Snowflake
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
index 0af2dc3a8..b1cabd2fb 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_without_offset
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Snowflake
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0.sql
index 0ee654060..dc180848e 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf measure aggregation node.
 
       Covers SUM, AVERAGE, SUM_BOOLEAN (transformed to SUM upstream), and COUNT_DISTINCT agg types
+sql_engine: Snowflake
 ---
 -- Aggregate Measures
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0_optimized.sql
index 8e65d6dca..b7a2b2ff8 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf measure aggregation node.
 
       Covers SUM, AVERAGE, SUM_BOOLEAN (transformed to SUM upstream), and COUNT_DISTINCT agg types
+sql_engine: Snowflake
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings', 'instant_bookings', 'average_booking_value', 'bookers']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0.sql
index dbcb37e35..3f018a5ef 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0_optimized.sql
index fe3abca27..dbcbd7c6d 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0.sql
index 502f992a7..6017e2694 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_order_by_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Snowflake
 ---
 -- Order By ['ds__day', 'bookings']
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0_optimized.sql
index 15e0abb64..36083b441 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_order_by_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Snowflake
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0.sql
index d597c33ce..00eb0ffbe 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Snowflake
 ---
 -- Join on MIN(ds) and [] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0_optimized.sql
index ed2690d3b..277a19fa4 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Snowflake
 ---
 -- Join on MIN(ds) and [] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0.sql
index 41b970cdc..0805a05a6 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_grouping
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode with a window_grouping.
+sql_engine: Snowflake
 ---
 -- Join on MAX(ds) and ['user'] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index d8406477e..64940449c 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_grouping
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode with a window_grouping.
+sql_engine: Snowflake
 ---
 -- Join on MAX(ds) and ['user'] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index 86b4fb0f1..a23a0b060 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_queried_group_by
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Snowflake
 ---
 -- Join on MIN(ds) and [] grouping by ds
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index e282ab7aa..0264e3fbb 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_queried_group_by
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Snowflake
 ---
 -- Join on MIN(ds) and [] grouping by ds
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0.sql
index f2703a96e..2dbf52e7d 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_single_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 1 dimension.
+sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0_optimized.sql
index 38534197c..61a6d1775 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_single_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 1 dimension.
+sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0.sql
index 06fa57a0d..403b5b965 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_source_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a single source node.
+sql_engine: Snowflake
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0_optimized.sql
index 4f4b2d1cb..d559f9f73 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_source_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a single source node.
+sql_engine: Snowflake
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_combine_output_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_combine_output_node__plan0.sql
index beaf6ab1d..a6683e71b 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_combine_output_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_combine_output_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_combine_output_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests combining AggregateMeasuresNode.
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_combine_output_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_combine_output_node__plan0_optimized.sql
index 83d03d0be..41aeb438e 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_combine_output_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_combine_output_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_combine_output_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests combining AggregateMeasuresNode.
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node__plan0.sql
index 80af12cc4..5c858de83 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node__plan0_optimized.sql
index a543654e5..fef79ad8c 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Trino
 ---
 -- Join Standard Outputs
 -- Aggregate Measures
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 7fd73a65a..09a44d066 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_multiple_semantic_models
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the combine metrics node for ratio type metrics.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
index 506dcc51b..a7ddeb2c1 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_multiple_semantic_models
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the combine metrics node for ratio type metrics.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index 04fa9f006..d9fe0befa 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_single_semantic_model
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for ratio type metrics sourced from a single semantic model.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
index d52a1a63d..b08ed160c 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_ratio_from_single_semantic_model__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_ratio_from_single_semantic_model
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for ratio type metrics sourced from a single semantic model.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_simple_expr__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_simple_expr__plan0.sql
index 470c1c9ee..fa33a9e22 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_simple_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_simple_expr
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for expr type metrics sourced from a single measure.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_simple_expr__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_simple_expr__plan0_optimized.sql
index af791bf49..29e5e78a1 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_simple_expr__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_compute_metrics_node_simple_expr__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_compute_metrics_node_simple_expr
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests the compute metrics node for expr type metrics sourced from a single measure.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_constrain_time_range_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_constrain_time_range_node__plan0.sql
index 0650194a9..2116a1fae 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_constrain_time_range_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_constrain_time_range_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_constrain_time_range_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting the ConstrainTimeRangeNode to SQL.
+sql_engine: Trino
 ---
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-02T00:00:00]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_constrain_time_range_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_constrain_time_range_node__plan0_optimized.sql
index 78dff8a3a..068e1086b 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_constrain_time_range_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_constrain_time_range_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_constrain_time_range_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting the ConstrainTimeRangeNode to SQL.
+sql_engine: Trino
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings', 'ds__day']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimension_with_joined_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimension_with_joined_where_constraint__plan0.sql
index e1cae52dd..6229ae8c0 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimension_with_joined_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimension_with_joined_where_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_with_joined_where_constraint
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['user__home_state_latest',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimension_with_joined_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimension_with_joined_where_constraint__plan0_optimized.sql
index a454bd953..31120dc4e 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimension_with_joined_where_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimension_with_joined_where_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_with_joined_where_constraint
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['user__home_state_latest',]
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0.sql
index 2254d611d..69e8ed5c4 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0_optimized.sql
index 53dc07a0e..9fe2ee937 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Trino
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_node__plan0.sql
index 5d801cb05..14083e569 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['bookings',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_node__plan0_optimized.sql
index 6bd8bbc9b..269b8c61e 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Trino
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings',]
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_node__plan0.sql
index 810f55747..e7e9605ef 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_node__plan0_optimized.sql
index 87d2298a5..1f6076862 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf pass filter node.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 41617b3c7..c3c15b667 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_to_grain
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
+sql_engine: Trino
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
index 510ed6ca2..7eb66ed47 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_to_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_to_grain
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_to_grain.
+sql_engine: Trino
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 483a2d69a..27f977f3e 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_window
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Trino
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
index a8e82f0f3..c3a09d1e9 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_with_offset_window__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_with_offset_window
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Trino
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_without_offset__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_without_offset__plan0.sql
index ee51fb7fb..5e26a68de 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_without_offset
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Trino
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_without_offset__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
index 5099afbba..11ad860b0 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_join_to_time_spine_node_without_offset__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_node_without_offset
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests JoinToTimeSpineNode for a single metric with offset_window.
+sql_engine: Trino
 ---
 -- Join to Time Spine Dataset
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_measure_aggregation_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_measure_aggregation_node__plan0.sql
index a544a7270..d733cbf63 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_measure_aggregation_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_measure_aggregation_node__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf measure aggregation node.
 
       Covers SUM, AVERAGE, SUM_BOOLEAN (transformed to SUM upstream), and COUNT_DISTINCT agg types
+sql_engine: Trino
 ---
 -- Aggregate Measures
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_measure_aggregation_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_measure_aggregation_node__plan0_optimized.sql
index 8e65d6dca..b42a7e581 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_measure_aggregation_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_measure_aggregation_node__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf measure aggregation node.
 
       Covers SUM, AVERAGE, SUM_BOOLEAN (transformed to SUM upstream), and COUNT_DISTINCT agg types
+sql_engine: Trino
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Pass Only Elements: ['bookings', 'instant_bookings', 'average_booking_value', 'bookers']
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_multi_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_multi_join_node__plan0.sql
index a9a534c98..aeda44bf0 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_multi_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_multi_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Trino
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_multi_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_multi_join_node__plan0_optimized.sql
index fe3abca27..f86a7cbfa 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_multi_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_multi_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Trino
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_order_by_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_order_by_node__plan0.sql
index 9f27905de..5647294c9 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_order_by_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_order_by_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_order_by_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Trino
 ---
 -- Order By ['ds__day', 'bookings']
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_order_by_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_order_by_node__plan0_optimized.sql
index 15e0abb64..88b293700 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_order_by_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_order_by_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_order_by_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a leaf compute metrics node.
+sql_engine: Trino
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node__plan0.sql
index 31d5ee69c..581dc106a 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Trino
 ---
 -- Join on MIN(ds) and [] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node__plan0_optimized.sql
index 158bd92cf..acff316cc 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Trino
 ---
 -- Join on MIN(ds) and [] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_grouping__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_grouping__plan0.sql
index b0da11242..b93acb11e 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_grouping
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode with a window_grouping.
+sql_engine: Trino
 ---
 -- Join on MAX(ds) and ['user'] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index 9f1462a78..0b4a5fd6c 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_grouping
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode with a window_grouping.
+sql_engine: Trino
 ---
 -- Join on MAX(ds) and ['user'] grouping by None
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index 9cfc28328..0bc612218 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_queried_group_by
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Trino
 ---
 -- Join on MIN(ds) and [] grouping by ds
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index 4d2cab04d..d3b6e6a50 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_semi_additive_join_node_with_queried_group_by
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan using a SemiAdditiveJoinNode.
+sql_engine: Trino
 ---
 -- Join on MIN(ds) and [] grouping by ds
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_single_join_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_single_join_node__plan0.sql
index 1fa696b23..15e93bcb3 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_single_join_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_single_join_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_single_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 1 dimension.
+sql_engine: Trino
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_single_join_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_single_join_node__plan0_optimized.sql
index 38534197c..26eabb652 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_single_join_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_single_join_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_single_join_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 1 dimension.
+sql_engine: Trino
 ---
 -- Join Standard Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_source_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_source_node__plan0.sql
index 55f1b1b1e..71e3b98d8 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_source_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_source_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_source_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a single source node.
+sql_engine: Trino
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 SELECT
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_source_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_source_node__plan0_optimized.sql
index be8073238..d7faee97f 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_source_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Trino/test_source_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_source_node
 test_filename: test_dataflow_to_sql_plan.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a single source node.
+sql_engine: Trino
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
index 3e4410580..455548480 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
index 0e1bf3ad1..f3a60c71e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql
index be8cc56fb..091ef8f00 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0_optimized.sql
index c713e1c18..b50107ee6 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
index 57abe3cd3..c2f3589a8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_derived_metric_that_defines_the_same_alias_in_different_componen
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests querying a derived metric which give the same alias to its components.
+sql_engine: BigQuery
 ---
 -- Order By [] Limit 1
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
index 7fcafc4ad..9269668a0 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_derived_metric_that_defines_the_same_alias_in_different_componen
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests querying a derived metric which give the same alias to its components.
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 -- Order By [] Limit 1
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
index 77674d7d1..4197903d8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_month_dimension_and_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
index 892fbc1d8..787df638c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_month_dimension_and_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
index dc86d996c..03cb0c964 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
index 2f6868ceb..a3b05090c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 4a15fc754..dfea0e70a 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
index b68c452ec..69b5a61e8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
index d8b2ae031..ab78f5349 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0_optimized.sql
index a68a55b8c..fa0b0ca3b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index a3047146c..b2418c319 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
index b6c7ec13f..cc6350e6d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index d4d692d31..d855e9f1e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
index b712a7377..a0e830b69 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 2c81c246c..eb13c7d7c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
index 8f11e3d1a..8f7ccace5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
index 9652195b3..9b1c01273 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_time_filter
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
index 3809ecf88..5fc91ceab 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_time_filter
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
index 6d77fac39..d4663973a 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_cumulative_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0_optimized.sql
index abc6a3b00..b66ab403f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_cumulative_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0.sql
index 7b11fc5c4..1df7cab10 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
index bfaa98097..3e333677d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 9315e861c..2982c1015 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_one_input_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
index 2d5f68ce4..fcc4c1501 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_one_input_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_multi_metric_fill_null__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_multi_metric_fill_null__plan0.sql
index 3ea62da59..6d707e54a 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_multi_metric_fill_null__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_multi_metric_fill_null__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multi_metric_fill_null
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_multi_metric_fill_null__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_multi_metric_fill_null__plan0_optimized.sql
index 62325f603..efc35be36 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_multi_metric_fill_null__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_multi_metric_fill_null__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multi_metric_fill_null
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql
index d14a046dc..0d1f2377f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0_optimized.sql
index 013f13b6b..c377f1c47 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
index 23f9ffc4b..f468b603e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_offset_with_joined_where_constraint_not_selected
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
index 222bf0df1..14f557c69 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_offset_with_joined_where_constraint_not_selected
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
index 5e60d5b45..35ac8330b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_with_offset_multiple_input_metrics
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
index a8fe6bd19..07eb7ffae 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_with_offset_multiple_input_metrics
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine__plan0.sql
index 2271dfdb6..a1c24002e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
index 10321ea0b..d915f0303 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
index 3b8a51280..998626e96 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine_multi_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
index c21bf0dcb..276d3da12 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine_multi_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_filters__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_filters__plan0.sql
index f5d49956e..a0903cae8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_filters__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_nested_filters
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests derived metric rendering for a nested derived metric with filters on the outer metric spec.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_filters__plan0_optimized.sql
index 95a14dbe8..0ba29d991 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_filters__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_nested_filters
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests derived metric rendering for a nested derived metric with filters on the outer metric spec.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets__plan0.sql
index ddd23b40a..4d4830152 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets__plan0_optimized.sql
index 842508963..14d59bc46 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0.sql
index 0075871b8..976fcea6f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0_optimized.sql
index 12d7d8ceb..f5654357b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0.sql
index 864db2676..3c351fcf5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_where_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0_optimized.sql
index 61706597d..974fba188 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_where_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
index c1455d1c3..40f11b475 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_filter_and_query_have_different_granulari
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with one granularity and filtered by a different one.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
index 77c9dc5c0..9b2141086 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_filter_and_query_have_different_granulari
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with one granularity and filtered by a different one.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0.sql
index 561a96197..306245462 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with multiple granularities.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
index 18d8a12b8..039f084b2 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with multiple granularities.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0.sql
index 5c4a51f5a..badbaea8f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_to_grain_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
index f0ca44734..fb7460574 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_to_grain_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
index 3b5611409..dc10f38bd 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_filter_and_query_have_different_granulariti
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with one granularity and filtered by a different one.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
index b23e551f4..73536fe94 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_filter_and_query_have_different_granulariti
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with one granularity and filtered by a different one.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0.sql
index e94ac9df9..c8630a4c7 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with multiple granularities.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
index 18024170a..a913e59a6 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with multiple granularities.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0.sql
index cdc450411..a0ef99cfd 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0_optimized.sql
index 75fa8164f..201002c96 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0.sql
index ca07f0a38..fa9169c91 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
index 7a24aa578..af157170a 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
index a663ed078..7b2561e64 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
index 2802640ea..70087237b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql
index b8bff2a82..31514a536 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric__plan0_optimized.sql
index a0e745d37..a8fb9b798 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
index 34f5a1830..ba5372498 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_derived_metric_that_defines_the_same_alias_in_different_componen
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests querying a derived metric which give the same alias to its components.
+sql_engine: Databricks
 ---
 -- Order By [] Limit 1
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
index b55fb3a96..456fd4087 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_derived_metric_that_defines_the_same_alias_in_different_componen
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests querying a derived metric which give the same alias to its components.
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 -- Order By [] Limit 1
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
index 1f5b0606c..6118addb8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_month_dimension_and_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
index 025a1b2eb..6c0fe0c3e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_month_dimension_and_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
index 361e27ddf..e634ee21b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
index 2783219cf..1e504f020 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 7a76e14c9..ea7afdaf5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
index 2761eb513..0422c7745 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
index cfecc0bb1..25f372d89 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0_optimized.sql
index 0d6c2437c..cf81e784d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 544def4fa..bd515b35c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
index b2f161dd3..f38cb7d2b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 58c54902a..29cbdafdc 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
index 9daf93a66..be9642ae8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 6df560b1b..5ebbd2a04 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
index 781bc3e70..55bf083f4 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
index 755e87c52..4875a4fc8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_time_filter
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
index e1831d9b5..f5faf4483 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_time_filter
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
index e5fb618b1..bd4eb3e83 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_cumulative_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0_optimized.sql
index 044002a12..46f8a04db 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_cumulative_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0.sql
index a1b79aa97..774b395b8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
index 26f9413a6..78ae26a9e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 261e0d0cb..31829a75c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_one_input_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
index 92b6ab08f..ef9112432 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_one_input_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_multi_metric_fill_null__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_multi_metric_fill_null__plan0.sql
index d860023b2..5882e31f7 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_multi_metric_fill_null__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_multi_metric_fill_null__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multi_metric_fill_null
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_multi_metric_fill_null__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_multi_metric_fill_null__plan0_optimized.sql
index eeed20a1b..e962df7e3 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_multi_metric_fill_null__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_multi_metric_fill_null__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multi_metric_fill_null
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql
index 3ca01ba1d..1b46541f0 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0_optimized.sql
index 95ed8c361..25edde45c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
index f654bcbe1..a746fa652 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_offset_with_joined_where_constraint_not_selected
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
index c96055954..6e2e83b47 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_offset_with_joined_where_constraint_not_selected
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
index e53b8c26b..c5682d462 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_with_offset_multiple_input_metrics
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
index 172da205b..3c7b7bd4b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_with_offset_multiple_input_metrics
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine__plan0.sql
index a4babfc55..3eaf90db5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
index 024faf954..dc2f86e8b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
index 7a2aaf5ac..8b650e2e5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine_multi_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
index 99ed1b864..7848e3fc5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine_multi_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_filters__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_filters__plan0.sql
index c2852502a..21cc776e3 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_filters__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_nested_filters
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests derived metric rendering for a nested derived metric with filters on the outer metric spec.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_filters__plan0_optimized.sql
index 95a14dbe8..1e23fe406 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_filters__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_nested_filters
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests derived metric rendering for a nested derived metric with filters on the outer metric spec.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets__plan0.sql
index d711070bd..890c4e3e7 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets__plan0_optimized.sql
index 3038b862f..afed1816e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_time_constraint__plan0.sql
index bada09c86..58d9e97d6 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_time_constraint__plan0_optimized.sql
index f70dd8c23..49e0d1fdd 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_where_constraint__plan0.sql
index 51915f2a1..35094f7bb 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_where_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_where_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_where_constraint__plan0_optimized.sql
index 5d8b51d4d..ec6b4352f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_where_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_nested_offsets_with_where_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_where_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
index 81273e99c..ba971f9be 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_filter_and_query_have_different_granulari
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with one granularity and filtered by a different one.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
index c14ad191c..a45feb035 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_filter_and_query_have_different_granulari
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with one granularity and filtered by a different one.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0.sql
index 1c0fe2314..b0d73d7f0 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with multiple granularities.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
index 2f1ca2a57..5b6603fdf 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with multiple granularities.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0.sql
index b3a9ae897..bfb33d1a6 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_to_grain_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
index 47c9444ae..c76a35a7a 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_to_grain_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
index b0c0ede11..e46cb1e76 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_filter_and_query_have_different_granulariti
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with one granularity and filtered by a different one.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
index 2f7b37c3f..0acbd8cac 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_filter_and_query_have_different_granulariti
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with one granularity and filtered by a different one.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0.sql
index 4608ff418..9013788a3 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with multiple granularities.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
index b2e53e669..6d98d432d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with multiple granularities.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_agg_time_dim__plan0.sql
index c492bbd6f..e195e45c3 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_agg_time_dim__plan0_optimized.sql
index f2f0eff1e..38008ad1e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0.sql
index 5c1d9643e..657dc7ed6 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
index abb1d9e17..670d1cb05 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
index 31bf2e30f..8687b2958 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
index 3c5b2595d..2aaf5a5ff 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql
index 7c151b7d9..00aa81f84 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0_optimized.sql
index a0e745d37..99170ffa9 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
index 568f8d064..c0c3268fa 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_derived_metric_that_defines_the_same_alias_in_different_componen
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests querying a derived metric which give the same alias to its components.
+sql_engine: DuckDB
 ---
 -- Order By [] Limit 1
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
index b55fb3a96..7a46cbd45 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_derived_metric_that_defines_the_same_alias_in_different_componen
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests querying a derived metric which give the same alias to its components.
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 -- Order By [] Limit 1
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
index 32af99cf7..497c4012f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_month_dimension_and_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
index 127eae1fc..dedecd527 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_month_dimension_and_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
index fd5744f5d..c4fbb6884 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
index 2783219cf..d7456bd9d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 7858c9d11..b933e3ea1 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
index 2761eb513..cfa6d1f5e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
index 3f94efb1f..3d18c9153 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0_optimized.sql
index 1fd5b3272..18cde7417 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 153ad3a22..1313b8af5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
index a282dd56c..42b79f2c6 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index dd31c62e9..9d7beef87 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
index 9d5b7b23f..cc78d4892 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 35adf51f0..30f9d6cef 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
index 64911b98b..b31f53052 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
index 42c9222d0..e18ced63c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_time_filter
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
index b0e66ed7b..66f5fe7c5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_time_filter
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
index 33f115132..86e90bb38 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_cumulative_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0_optimized.sql
index 8061e9fd0..47db02e9d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_cumulative_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0.sql
index d5bdcc0a2..60eac90fe 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
index c65d640c0..d916d9e53 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
index f143f8f13..3ab9a2558 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_one_input_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
index adb577db8..4a3f73bad 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_one_input_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_multi_metric_fill_null__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_multi_metric_fill_null__plan0.sql
index 3814a22c3..3711cf2f9 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_multi_metric_fill_null__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_multi_metric_fill_null__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multi_metric_fill_null
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_multi_metric_fill_null__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_multi_metric_fill_null__plan0_optimized.sql
index eeed20a1b..d2ae62f58 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_multi_metric_fill_null__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_multi_metric_fill_null__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multi_metric_fill_null
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql
index f615f69ac..5975d4183 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0_optimized.sql
index 95ed8c361..8d9bf1af4 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
index ae6f73d7e..a2c06603c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_offset_with_joined_where_constraint_not_selected
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
index 7a509eadb..d62752cb4 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_offset_with_joined_where_constraint_not_selected
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
index 67d1bc4ee..d979f89e3 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_with_offset_multiple_input_metrics
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
index 172da205b..101e623ab 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_with_offset_multiple_input_metrics
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine__plan0.sql
index 473e890f0..96d4565eb 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
index 024faf954..56570a8c1 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
index f10dc83fa..c838c82be 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine_multi_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
index 99ed1b864..476ceafc1 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine_multi_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_filters__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_filters__plan0.sql
index cef4cca9b..27d3e680e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_filters__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_nested_filters
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests derived metric rendering for a nested derived metric with filters on the outer metric spec.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_filters__plan0_optimized.sql
index 95a14dbe8..d61665f8e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_filters__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_nested_filters
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests derived metric rendering for a nested derived metric with filters on the outer metric spec.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets__plan0.sql
index 0c8d3baf2..a851e43a3 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets__plan0_optimized.sql
index 8db033ffa..ec796be86 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0.sql
index 77866264d..ddd6e6235 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0_optimized.sql
index 16d3fe003..677431f0c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0.sql
index 7d35c8aa1..b104ae2cb 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_where_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0_optimized.sql
index ba80ca377..5d979eb0c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_where_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
index 8c1148d38..72b5a8eff 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_filter_and_query_have_different_granulari
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with one granularity and filtered by a different one.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
index c14ad191c..29518080d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_filter_and_query_have_different_granulari
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with one granularity and filtered by a different one.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0.sql
index 5b3fa15ce..5444675ba 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with multiple granularities.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
index 2f1ca2a57..d92697dcf 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with multiple granularities.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0.sql
index 8b840d4fd..fb482efc7 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_to_grain_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
index 47c9444ae..8fadab17b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_to_grain_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
index 32ee63b03..927127c08 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_filter_and_query_have_different_granulariti
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with one granularity and filtered by a different one.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
index 9238964f0..63f543a97 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_filter_and_query_have_different_granulariti
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with one granularity and filtered by a different one.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0.sql
index a12398ea1..ffb393b1f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with multiple granularities.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
index b8cdbc28b..0c93f0425 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with multiple granularities.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0.sql
index fb931c522..de2bbaadc 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0_optimized.sql
index 4b39ae1f9..84c0c9aea 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0.sql
index 692b16259..73f42bbf8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
index 1f3204d10..a4195af29 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
index 8fe9be605..0927844d4 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
index 2330eb284..97593fc28 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql
index 7c151b7d9..acc1275b3 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric__plan0_optimized.sql
index a0e745d37..d5922afa2 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
index 568f8d064..c14ffef43 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_derived_metric_that_defines_the_same_alias_in_different_componen
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests querying a derived metric which give the same alias to its components.
+sql_engine: Postgres
 ---
 -- Order By [] Limit 1
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
index b55fb3a96..46c9cc3be 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_derived_metric_that_defines_the_same_alias_in_different_componen
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests querying a derived metric which give the same alias to its components.
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 -- Order By [] Limit 1
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
index e7d2e80a1..4518dcda4 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_month_dimension_and_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
index 8b3ae46c1..0a4583625 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_month_dimension_and_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
index fd5744f5d..18a8bd89f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
index 2783219cf..ece4b86e4 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 7858c9d11..2fe28b5f2 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
index 2761eb513..32cb49a8e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
index 894ee16b9..95cc95943 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0_optimized.sql
index 2ab158c24..9e88eaf12 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index d6ca3377b..97dbca903 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
index 52a8ea63a..53a9fe09c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 2fc5dc748..6f643295f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
index 317d27009..97deaf2d8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 5d16cf63f..2d25e0810 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
index e8c60395e..d5a61f7a8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
index a683fc704..d81a0bd29 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_time_filter
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
index 669be9897..2f0e94a1b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_time_filter
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
index 2060e68e6..1bb65d4bd 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_cumulative_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0_optimized.sql
index 83c9b9647..1329a0ade 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_cumulative_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0.sql
index 0a060dde6..064da1e7d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
index 47fc8b362..2f6371d3f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 5de8488f2..9213168ed 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_one_input_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
index 0a08f69fd..814f94c4a 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_one_input_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_multi_metric_fill_null__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_multi_metric_fill_null__plan0.sql
index 3814a22c3..d62883dae 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_multi_metric_fill_null__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_multi_metric_fill_null__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multi_metric_fill_null
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_multi_metric_fill_null__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_multi_metric_fill_null__plan0_optimized.sql
index eeed20a1b..49134d7ee 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_multi_metric_fill_null__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_multi_metric_fill_null__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multi_metric_fill_null
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql
index f615f69ac..bd680e56a 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0_optimized.sql
index 95ed8c361..a34abf65e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
index 72685b7ff..f30a7ea83 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_offset_with_joined_where_constraint_not_selected
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
index 92b13ee6b..c11fef9c7 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_offset_with_joined_where_constraint_not_selected
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
index 67d1bc4ee..9dc4ef1ac 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_with_offset_multiple_input_metrics
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
index 172da205b..2f8d1a2c5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_with_offset_multiple_input_metrics
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine__plan0.sql
index 473e890f0..1f9bca7df 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
index 024faf954..1811e2491 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
index f10dc83fa..bd8f28a0f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine_multi_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
index 99ed1b864..78486ed3b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine_multi_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_filters__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_filters__plan0.sql
index cef4cca9b..b013a56ac 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_filters__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_nested_filters
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests derived metric rendering for a nested derived metric with filters on the outer metric spec.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_filters__plan0_optimized.sql
index 95a14dbe8..1f99c4eda 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_filters__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_nested_filters
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests derived metric rendering for a nested derived metric with filters on the outer metric spec.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets__plan0.sql
index 2e5c7466a..52b31be08 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets__plan0_optimized.sql
index f6ccd9e70..ba241866d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_time_constraint__plan0.sql
index b92557b33..13a96edff 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_time_constraint__plan0_optimized.sql
index 15ca71a8c..812192844 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_where_constraint__plan0.sql
index c2c4914be..751d21034 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_where_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_where_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_where_constraint__plan0_optimized.sql
index 8ec7792e0..0aa067052 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_where_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_nested_offsets_with_where_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_where_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
index 8c1148d38..89596a1ed 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_filter_and_query_have_different_granulari
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with one granularity and filtered by a different one.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
index c14ad191c..52f737090 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_filter_and_query_have_different_granulari
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with one granularity and filtered by a different one.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0.sql
index 5b3fa15ce..4e7a675cb 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with multiple granularities.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
index 2f1ca2a57..321cb4ac6 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with multiple granularities.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0.sql
index 8b840d4fd..653805878 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_to_grain_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
index 47c9444ae..e102ca870 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_to_grain_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
index 9ca1a90c0..52d416485 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_filter_and_query_have_different_granulariti
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with one granularity and filtered by a different one.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
index ab92cda3b..3934f7c7b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_filter_and_query_have_different_granulariti
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with one granularity and filtered by a different one.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0.sql
index 71726abb1..71b40a688 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with multiple granularities.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
index 731a97a77..34c12c7bd 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with multiple granularities.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_agg_time_dim__plan0.sql
index afe7e7241..9bfdb6ef0 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_agg_time_dim__plan0_optimized.sql
index 2ac746e5b..9d3549dd5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0.sql
index 1b8fbde48..b2bad3461 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
index 4a198f923..904c87a36 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
index 52cbc0eb9..0b9759219 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
index 2802640ea..ac52eb2c8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql
index e1182b4e1..ba1b126c8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric__plan0_optimized.sql
index a0e745d37..49941151d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
index 267c114bb..adfe74e8a 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_derived_metric_that_defines_the_same_alias_in_different_componen
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests querying a derived metric which give the same alias to its components.
+sql_engine: Redshift
 ---
 -- Order By [] Limit 1
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
index b55fb3a96..71f376db7 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_derived_metric_that_defines_the_same_alias_in_different_componen
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests querying a derived metric which give the same alias to its components.
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 -- Order By [] Limit 1
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
index 1f5b0606c..a3eb7774e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_month_dimension_and_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
index 025a1b2eb..d755bb7d5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_month_dimension_and_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
index d6759f3f7..f4a2fed1f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
index 2783219cf..464cffe60 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index cbfee5f5f..cf24407aa 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
index 2761eb513..d9147b7bd 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
index 425b41c81..2a433514d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0_optimized.sql
index 0d6c2437c..cfa62f92a 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index f32fcdefe..07697b3a4 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
index b2f161dd3..b6bc0d71d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 78972ede5..2a31dc99d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
index 9daf93a66..f23d4f512 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index e087dc2cd..4b7f458d9 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
index 781bc3e70..c0e2a731e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
index 6fcce08cd..b77fdf6bf 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_time_filter
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
index e1831d9b5..398662084 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_time_filter
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
index f65689a73..9c63f2ec3 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_cumulative_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0_optimized.sql
index 044002a12..28071a31e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_cumulative_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0.sql
index afbe3fa78..021ac16d7 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
index 26f9413a6..67fe080a8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 6af2b3242..4c35c5327 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_one_input_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
index 92b6ab08f..6b9a08d0b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_one_input_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_multi_metric_fill_null__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_multi_metric_fill_null__plan0.sql
index 8d2f985ae..ec3f44bf8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_multi_metric_fill_null__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_multi_metric_fill_null__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multi_metric_fill_null
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_multi_metric_fill_null__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_multi_metric_fill_null__plan0_optimized.sql
index eeed20a1b..3fcf40b4d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_multi_metric_fill_null__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_multi_metric_fill_null__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multi_metric_fill_null
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql
index e895f945a..80572c96c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0_optimized.sql
index 95ed8c361..626212607 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
index f960dc6da..5cc8fba65 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_offset_with_joined_where_constraint_not_selected
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
index c96055954..606a9fa31 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_offset_with_joined_where_constraint_not_selected
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
index 5b52bdf5e..a4fee3a34 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_with_offset_multiple_input_metrics
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
index 172da205b..38559a01a 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_with_offset_multiple_input_metrics
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine__plan0.sql
index 97b5fd098..8533ed46d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
index 024faf954..305efccf5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
index 5f2e333e4..30ec964ce 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine_multi_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
index 99ed1b864..06a0d6ccc 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine_multi_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_filters__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_filters__plan0.sql
index bd40e8be2..ad66b7757 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_filters__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_nested_filters
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests derived metric rendering for a nested derived metric with filters on the outer metric spec.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_filters__plan0_optimized.sql
index 95a14dbe8..0cb09da10 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_filters__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_nested_filters
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests derived metric rendering for a nested derived metric with filters on the outer metric spec.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets__plan0.sql
index 93f6cba15..da0209be0 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets__plan0_optimized.sql
index 3038b862f..858599a4b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_time_constraint__plan0.sql
index 253f546b0..f8b30e4fc 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_time_constraint__plan0_optimized.sql
index f70dd8c23..fef5b7164 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_where_constraint__plan0.sql
index 8c0ff04cd..d2b3aa215 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_where_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_where_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_where_constraint__plan0_optimized.sql
index 5d8b51d4d..3d6418dab 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_where_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_nested_offsets_with_where_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_where_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
index e080aba62..7e622f5b0 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_filter_and_query_have_different_granulari
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with one granularity and filtered by a different one.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
index c14ad191c..e2ef45757 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_filter_and_query_have_different_granulari
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with one granularity and filtered by a different one.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0.sql
index c0c3196a4..79162bce6 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with multiple granularities.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
index 2f1ca2a57..e47d7558a 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with multiple granularities.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0.sql
index fb6ed224a..2b8228302 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_to_grain_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
index 47c9444ae..3aefd9bee 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_to_grain_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
index cd115529b..b2e4acb8f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_filter_and_query_have_different_granulariti
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with one granularity and filtered by a different one.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
index 2f7b37c3f..2608a60ba 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_filter_and_query_have_different_granulariti
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with one granularity and filtered by a different one.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0.sql
index 192c9774f..83d556f54 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with multiple granularities.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
index b2e53e669..22753736d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with multiple granularities.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_agg_time_dim__plan0.sql
index 7c170a3fe..47ef72345 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_agg_time_dim__plan0_optimized.sql
index f2f0eff1e..c0f274803 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0.sql
index f855aaa32..37b3e9f49 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
index abb1d9e17..c855be0bd 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
index 6960c8174..c2623ba16 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
index 2802640ea..9aae37738 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql
index f2a92c2bf..d2181c82f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0_optimized.sql
index a0e745d37..bafa9600f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
index 0c2864221..7fcc8718d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_derived_metric_that_defines_the_same_alias_in_different_componen
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests querying a derived metric which give the same alias to its components.
+sql_engine: Snowflake
 ---
 -- Order By [] Limit 1
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
index b55fb3a96..024a2779d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_derived_metric_that_defines_the_same_alias_in_different_componen
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests querying a derived metric which give the same alias to its components.
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 -- Order By [] Limit 1
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
index 1f5b0606c..4a1ea1fbc 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_month_dimension_and_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
index 025a1b2eb..7b3141607 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_month_dimension_and_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
index 471f9f7e5..62142e1dd 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
index 2783219cf..f61138cd3 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index a22a4215f..64a790683 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
index 2761eb513..9d2b8b9ae 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
index 18e618d1c..a8e292868 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0_optimized.sql
index 0d6c2437c..ce55aa295 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 47397dbc9..04b5e8c1c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
index b2f161dd3..8b3679742 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 7f278a2b1..e616d74d7 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
index 9daf93a66..a19241a8b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 8131f772c..2e09e204d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
index 781bc3e70..b8eb112e7 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
index dd33b1a0d..0de51ffc4 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_time_filter
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
index e1831d9b5..f8f10fb73 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_time_filter
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
index 95065072f..437e55458 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_cumulative_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0_optimized.sql
index 044002a12..3776496f5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_cumulative_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0.sql
index 9fa2a7182..73774979c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
index 26f9413a6..88b862779 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
index bdcbf25cb..bc36f5bb5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_one_input_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
index 92b6ab08f..a603ed6aa 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_one_input_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_multi_metric_fill_null__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_multi_metric_fill_null__plan0.sql
index facf862da..bd20d2815 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_multi_metric_fill_null__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_multi_metric_fill_null__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multi_metric_fill_null
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_multi_metric_fill_null__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_multi_metric_fill_null__plan0_optimized.sql
index eeed20a1b..ca0e3a997 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_multi_metric_fill_null__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_multi_metric_fill_null__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multi_metric_fill_null
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql
index 95d95376a..cf32aae53 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0_optimized.sql
index 95ed8c361..f48b4f909 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
index 72a8f129f..b45f7776e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_offset_with_joined_where_constraint_not_selected
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
index c96055954..9388c1fcc 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_offset_with_joined_where_constraint_not_selected
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
index 8318978d4..c9fd0a099 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_with_offset_multiple_input_metrics
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
index 172da205b..58da2a3cc 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_with_offset_multiple_input_metrics
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine__plan0.sql
index 73d9f13b4..c69ed5a47 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
index 024faf954..a123a96e5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
index a1e403c31..b174ef13d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine_multi_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
index 99ed1b864..ff990f19b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine_multi_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_filters__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_filters__plan0.sql
index 1c7c321b9..a1e115cd8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_filters__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_nested_filters
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests derived metric rendering for a nested derived metric with filters on the outer metric spec.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_filters__plan0_optimized.sql
index 95a14dbe8..c070ddafd 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_filters__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_nested_filters
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests derived metric rendering for a nested derived metric with filters on the outer metric spec.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets__plan0.sql
index 37946817f..890155884 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets__plan0_optimized.sql
index 3038b862f..f750dc648 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0.sql
index d42d45de8..10be64ac1 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0_optimized.sql
index f70dd8c23..dc5ec3de8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0.sql
index ef7e5ef08..c50436acd 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_where_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0_optimized.sql
index 5d8b51d4d..d23fbf4a1 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_where_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
index 22e70d2af..1b8d5f3c7 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_filter_and_query_have_different_granulari
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with one granularity and filtered by a different one.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
index c14ad191c..2fec95707 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_filter_and_query_have_different_granulari
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with one granularity and filtered by a different one.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0.sql
index 35028c335..c9aaa5d3c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with multiple granularities.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
index 2f1ca2a57..d270f2280 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with multiple granularities.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0.sql
index f286cba87..0add7b9ae 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_to_grain_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
index 47c9444ae..cc5e1978f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_to_grain_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
index 2f7d3a9cf..b70bf53df 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_filter_and_query_have_different_granulariti
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with one granularity and filtered by a different one.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
index 2f7b37c3f..28159c151 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_filter_and_query_have_different_granulariti
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with one granularity and filtered by a different one.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0.sql
index 1dac1e70e..1bf348eda 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with multiple granularities.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
index b2e53e669..1e3460920 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with multiple granularities.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0.sql
index 959e6bd4a..cf02ce98e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0_optimized.sql
index f2f0eff1e..bc37fe731 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0.sql
index 816d9d413..f7320ca81 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
index abb1d9e17..d1eb7907e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
index c8641824f..de3e61401 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
index 6cc27fec1..2026fd215 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric__plan0.sql
index b66fa9b45..b8eea3fa9 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric__plan0_optimized.sql
index a0e745d37..3521bdd8f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
index 023b392c7..6a397b5c1 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_derived_metric_that_defines_the_same_alias_in_different_componen
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests querying a derived metric which give the same alias to its components.
+sql_engine: Trino
 ---
 -- Order By [] Limit 1
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
index b55fb3a96..3a8340d23 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_that_defines_the_same_alias_in_different_components__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_derived_metric_that_defines_the_same_alias_in_different_componen
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests querying a derived metric which give the same alias to its components.
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 -- Order By [] Limit 1
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
index 1b5c1d010..d863e36e6 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_month_dimension_and_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
index a208dc78e..88c79149c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_month_dimension_and_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain__plan0.sql
index 087d2ab9b..b206ee786 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
index 2783219cf..7c14527ad 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 320c80d78..1a44e848f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
index 2761eb513..20579c629 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window__plan0.sql
index 96ea85a6d..c5981d5cb 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window__plan0_optimized.sql
index 019ccb0b7..97562a5c6 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index ed6739094..4512f1dde 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
index 1b797b229..a92f24882 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index cb736153c..8f12e7bb5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
index 868a3fe86..320c34869 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index b1958723f..f86c7dbc0 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
index c28a234b0..376523e66 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
index ae16abc3a..7f723cac3 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_time_filter
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
index c4960a19d..deaef7874 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_metric_with_offset_window_and_time_filter
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_cumulative_metric__plan0.sql
index 27a88e00a..85b6e8fd7 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_cumulative_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_cumulative_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_cumulative_metric__plan0_optimized.sql
index 12bafb04a..c9431a6e5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_cumulative_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_cumulative_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0.sql
index c82556d32..c746f2616 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
index 6ad8395e4..bf4161748 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 3ffd1fe6a..854446fc3 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_one_input_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
index 4f6deaac7..bb78d05bf 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_offset_metric_with_one_input_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_multi_metric_fill_null__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_multi_metric_fill_null__plan0.sql
index 4cf6bee29..42b2c4658 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_multi_metric_fill_null__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_multi_metric_fill_null__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multi_metric_fill_null
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_multi_metric_fill_null__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_multi_metric_fill_null__plan0_optimized.sql
index eeed20a1b..426c0682a 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_multi_metric_fill_null__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_multi_metric_fill_null__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multi_metric_fill_null
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric__plan0.sql
index 849f79383..1edccab42 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric__plan0_optimized.sql
index 95ed8c361..d0deaa9a1 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
index 9ca9a9c98..11de21528 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_offset_with_joined_where_constraint_not_selected
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
index f4590d19e..8adb624ac 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_offset_with_joined_where_constraint_not_selected
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
index ad3bb76bf..683e71770 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_with_offset_multiple_input_metrics
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
index 172da205b..0694bbdbd 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_derived_metric_with_offset_multiple_input_metrics
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine__plan0.sql
index 89efca230..5ad2ce434 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
index 024faf954..b62cdb2dd 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
index 7d8bd53ce..5a1f207a7 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine_multi_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine_multi_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
index 99ed1b864..aad7e04f4 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_fill_nulls_without_time_spine_multi_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_fill_nulls_without_time_spine_multi_metric
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_filters__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_filters__plan0.sql
index 9b58d7208..7277371b1 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_filters__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_nested_filters
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests derived metric rendering for a nested derived metric with filters on the outer metric spec.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_filters__plan0_optimized.sql
index 95a14dbe8..d58e04b19 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_filters__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_nested_filters
 test_filename: test_derived_metric_rendering.py
 docstring:
   Tests derived metric rendering for a nested derived metric with filters on the outer metric spec.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets__plan0.sql
index 71e5a8a4e..d88fac446 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets__plan0_optimized.sql
index 96dfe87f3..02db30d70 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_time_constraint__plan0.sql
index 710a19e7f..a8c04f20d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_time_constraint__plan0_optimized.sql
index be656dd70..d60807863 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_where_constraint__plan0.sql
index 7eb1a0440..7934462a2 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_where_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_where_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_where_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_where_constraint__plan0_optimized.sql
index 1a23cb4d2..eda2cec26 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_where_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_nested_offsets_with_where_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_nested_offsets_with_where_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
index f4b03b284..714a52605 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_filter_and_query_have_different_granulari
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with one granularity and filtered by a different one.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
index c14ad191c..600f39647 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_filter_and_query_have_different_granulari
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with one granularity and filtered by a different one.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0.sql
index 9a762fe33..dde80c8c6 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with multiple granularities.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
index 2f1ca2a57..88c1ed0b7 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_to_grain_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset to grain metric is queried with multiple granularities.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0.sql
index 82c7e012c..b3ce0598f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_to_grain_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
index 47c9444ae..9f5c75d84 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_to_grain_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
index cc68fa2b4..83e94c14b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_filter_and_query_have_different_granulariti
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with one granularity and filtered by a different one.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
index 77476a4df..c2acb8801 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_filter_and_query_have_different_granulariti
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with one granularity and filtered by a different one.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_multiple_granularities__plan0.sql
index 73d4c4e4a..3de997c20 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_multiple_granularities__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with multiple granularities.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_multiple_granularities__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
index 76422cd95..5111961e5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_metric_multiple_granularities__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_offset_window_metric_multiple_granularities
 test_filename: test_derived_metric_rendering.py
 docstring:
   Test a query where an offset window metric is queried with multiple granularities.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_agg_time_dim__plan0.sql
index 63e0f59e9..0810e1f3e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_agg_time_dim__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_agg_time_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_agg_time_dim__plan0_optimized.sql
index 589e2603c..fe12cd0d6 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_agg_time_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_agg_time_dim__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_agg_time_dim
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_time_offset_metric_with_time_constraint__plan0.sql
index 9feb0bc57..a3cb95757 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_time_offset_metric_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_time_offset_metric_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
index 0b8985b04..0d06d2459 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlQueryPlan/Trino/test_time_offset_metric_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_time_offset_metric_with_time_constraint
 test_filename: test_derived_metric_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimension_values_with_a_join_and_a_filter__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimension_values_with_a_join_and_a_filter__plan0.sql
index ad604d224..c07662621 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimension_values_with_a_join_and_a_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimension_values_with_a_join_and_a_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_values_with_a_join_and_a_filter
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join and a filter.
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
index 6453db305..b1a80663d 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_values_with_a_join_and_a_filter
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join and a filter.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0.sql
index 9abf4f068..f41e15fab 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0_optimized.sql
index 6ce68105c..b2f5027c0 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/BigQuery/test_dimensions_requiring_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimension_values_with_a_join_and_a_filter__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimension_values_with_a_join_and_a_filter__plan0.sql
index 72b01bbf7..c90057ec7 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimension_values_with_a_join_and_a_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimension_values_with_a_join_and_a_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_values_with_a_join_and_a_filter
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join and a filter.
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
index 6453db305..305048678 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_values_with_a_join_and_a_filter
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join and a filter.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0.sql
index 95159176a..2d384ca49 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0_optimized.sql
index 5b8ece1d5..dfd6006cf 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Databricks/test_dimensions_requiring_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Databricks
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimension_values_with_a_join_and_a_filter__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimension_values_with_a_join_and_a_filter__plan0.sql
index 79cfb7d76..66eaa5860 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimension_values_with_a_join_and_a_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimension_values_with_a_join_and_a_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_values_with_a_join_and_a_filter
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join and a filter.
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
index 6453db305..e44133c25 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_values_with_a_join_and_a_filter
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join and a filter.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0.sql
index c573c05f4..8ec392b93 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0_optimized.sql
index 5b8ece1d5..d08c9a1fe 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/DuckDB/test_dimensions_requiring_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimension_values_with_a_join_and_a_filter__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimension_values_with_a_join_and_a_filter__plan0.sql
index 79cfb7d76..bd8f65ac8 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimension_values_with_a_join_and_a_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimension_values_with_a_join_and_a_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_values_with_a_join_and_a_filter
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join and a filter.
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
index 6453db305..a97b9e245 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_values_with_a_join_and_a_filter
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join and a filter.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0.sql
index c573c05f4..6f809edf0 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0_optimized.sql
index 5b8ece1d5..697df026a 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Postgres/test_dimensions_requiring_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Postgres
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimension_values_with_a_join_and_a_filter__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimension_values_with_a_join_and_a_filter__plan0.sql
index a14686d65..2c71db3f3 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimension_values_with_a_join_and_a_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimension_values_with_a_join_and_a_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_values_with_a_join_and_a_filter
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join and a filter.
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
index 6453db305..999de28cf 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_values_with_a_join_and_a_filter
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join and a filter.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0.sql
index 44189fdb6..466a2bf25 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0_optimized.sql
index 5b8ece1d5..1268c4f35 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Redshift/test_dimensions_requiring_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Redshift
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimension_values_with_a_join_and_a_filter__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimension_values_with_a_join_and_a_filter__plan0.sql
index d08149993..351824e69 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimension_values_with_a_join_and_a_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimension_values_with_a_join_and_a_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_values_with_a_join_and_a_filter
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join and a filter.
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
index 6453db305..f27735ce2 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_values_with_a_join_and_a_filter
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join and a filter.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0.sql
index 0b1fcf6fa..b2b7e50db 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0_optimized.sql
index 5b8ece1d5..e4f840cc1 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Snowflake/test_dimensions_requiring_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimension_values_with_a_join_and_a_filter__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimension_values_with_a_join_and_a_filter__plan0.sql
index 6e02424ec..9677dc807 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimension_values_with_a_join_and_a_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimension_values_with_a_join_and_a_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_values_with_a_join_and_a_filter
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join and a filter.
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
index 6453db305..60fce5134 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimension_values_with_a_join_and_a_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimension_values_with_a_join_and_a_filter
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join and a filter.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0.sql
index d252f7bb5..35e302857 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
 SELECT
diff --git a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0_optimized.sql
index 5b8ece1d5..a0d289126 100644
--- a/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_distinct_values_to_sql.py/SqlQueryPlan/Trino/test_dimensions_requiring_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_dimensions_requiring_join
 test_filename: test_distinct_values_to_sql.py
 docstring:
   Tests querying 2 dimensions that require a join.
+sql_engine: Trino
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest']
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_approximate_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_approximate_continuous_percentile_expr__plan0.sql
index a8b88c13a..0c9566846 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_approximate_continuous_percentile_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_approximate_continuous_percentile_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_approximate_continuous_percentile_expr
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the approximate continuous percentile expression in a query.
+sql_engine: BigQuery
 ---
 -- Test Approximate Continuous Percentile Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_cast_to_timestamp__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_cast_to_timestamp__plan0.sql
index 54696c35c..6f3a1b022 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_cast_to_timestamp__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_cast_to_timestamp__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cast_to_timestamp
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the cast to timestamp expression in a query.
+sql_engine: BigQuery
 ---
 -- Test Cast to Timestamp Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_generate_uuid__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_generate_uuid__plan0.sql
index 59729d166..017a9faf3 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_generate_uuid__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/BigQuery/test_generate_uuid__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_generate_uuid
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the generate uuid expression in a query.
+sql_engine: BigQuery
 ---
 -- Test Generate UUID Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_approximate_discrete_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_approximate_discrete_percentile_expr__plan0.sql
index c3d449bee..307565240 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_approximate_discrete_percentile_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_approximate_discrete_percentile_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_approximate_discrete_percentile_expr
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the approximate discrete percentile expression in a query.
+sql_engine: Databricks
 ---
 -- Test Approximate Discrete Percentile Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_cast_to_timestamp__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_cast_to_timestamp__plan0.sql
index 2469a78b8..e77e18f78 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_cast_to_timestamp__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_cast_to_timestamp__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cast_to_timestamp
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the cast to timestamp expression in a query.
+sql_engine: Databricks
 ---
 -- Test Cast to Timestamp Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_continuous_percentile_expr__plan0.sql
index 0aefd17ee..a7fbfcdec 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_continuous_percentile_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_continuous_percentile_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_continuous_percentile_expr
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the continuous percentile expression in a query.
+sql_engine: Databricks
 ---
 -- Test Continuous Percentile Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_generate_uuid__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_generate_uuid__plan0.sql
index 38b3e5459..9040ccf36 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_generate_uuid__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Databricks/test_generate_uuid__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_generate_uuid
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the generate uuid expression in a query.
+sql_engine: Databricks
 ---
 -- Test Generate UUID Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_approximate_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_approximate_continuous_percentile_expr__plan0.sql
index 4fffd2591..162d54150 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_approximate_continuous_percentile_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_approximate_continuous_percentile_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_approximate_continuous_percentile_expr
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the approximate continuous percentile expression in a query.
+sql_engine: DuckDB
 ---
 -- Test Approximate Continuous Percentile Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_cast_to_timestamp__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_cast_to_timestamp__plan0.sql
index 2469a78b8..e3a9f0df7 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_cast_to_timestamp__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_cast_to_timestamp__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cast_to_timestamp
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the cast to timestamp expression in a query.
+sql_engine: DuckDB
 ---
 -- Test Cast to Timestamp Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_continuous_percentile_expr__plan0.sql
index 0aefd17ee..839f67190 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_continuous_percentile_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_continuous_percentile_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_continuous_percentile_expr
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the continuous percentile expression in a query.
+sql_engine: DuckDB
 ---
 -- Test Continuous Percentile Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_discrete_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_discrete_percentile_expr__plan0.sql
index 0f2777722..56cbccfca 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_discrete_percentile_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_discrete_percentile_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_discrete_percentile_expr
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the discrete percentile expression in a query.
+sql_engine: DuckDB
 ---
 -- Test Discrete Percentile Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_generate_uuid__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_generate_uuid__plan0.sql
index ed72a6186..c32ddfce5 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_generate_uuid__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/DuckDB/test_generate_uuid__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_generate_uuid
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the generate uuid expression in a query.
+sql_engine: DuckDB
 ---
 -- Test Generate UUID Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_cast_to_timestamp__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_cast_to_timestamp__plan0.sql
index 2469a78b8..7296d260c 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_cast_to_timestamp__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_cast_to_timestamp__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cast_to_timestamp
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the cast to timestamp expression in a query.
+sql_engine: Postgres
 ---
 -- Test Cast to Timestamp Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_continuous_percentile_expr__plan0.sql
index 0aefd17ee..90f98a8ca 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_continuous_percentile_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_continuous_percentile_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_continuous_percentile_expr
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the continuous percentile expression in a query.
+sql_engine: Postgres
 ---
 -- Test Continuous Percentile Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_discrete_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_discrete_percentile_expr__plan0.sql
index 0f2777722..28a39b141 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_discrete_percentile_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_discrete_percentile_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_discrete_percentile_expr
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the discrete percentile expression in a query.
+sql_engine: Postgres
 ---
 -- Test Discrete Percentile Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_generate_uuid__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_generate_uuid__plan0.sql
index ed72a6186..83fe7b470 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_generate_uuid__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Postgres/test_generate_uuid__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_generate_uuid
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the generate uuid expression in a query.
+sql_engine: Postgres
 ---
 -- Test Generate UUID Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_approximate_discrete_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_approximate_discrete_percentile_expr__plan0.sql
index fa779e335..4a03cc1d6 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_approximate_discrete_percentile_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_approximate_discrete_percentile_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_approximate_discrete_percentile_expr
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the approximate discrete percentile expression in a query.
+sql_engine: Redshift
 ---
 -- Test Approximate Discrete Percentile Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_cast_to_timestamp__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_cast_to_timestamp__plan0.sql
index 2469a78b8..5f72bc9ba 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_cast_to_timestamp__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_cast_to_timestamp__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cast_to_timestamp
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the cast to timestamp expression in a query.
+sql_engine: Redshift
 ---
 -- Test Cast to Timestamp Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_continuous_percentile_expr__plan0.sql
index 0aefd17ee..8ad0692c4 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_continuous_percentile_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_continuous_percentile_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_continuous_percentile_expr
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the continuous percentile expression in a query.
+sql_engine: Redshift
 ---
 -- Test Continuous Percentile Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_generate_uuid__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_generate_uuid__plan0.sql
index 90036d94c..6e635dcf4 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_generate_uuid__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Redshift/test_generate_uuid__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_generate_uuid
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the generate uuid expression in a query.
+sql_engine: Redshift
 ---
 -- Test Generate UUID Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_approximate_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_approximate_continuous_percentile_expr__plan0.sql
index 91e5eb29f..d745744cf 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_approximate_continuous_percentile_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_approximate_continuous_percentile_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_approximate_continuous_percentile_expr
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the approximate continuous percentile expression in a query.
+sql_engine: Snowflake
 ---
 -- Test Approximate Continuous Percentile Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_cast_to_timestamp__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_cast_to_timestamp__plan0.sql
index 2469a78b8..4900ca578 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_cast_to_timestamp__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_cast_to_timestamp__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cast_to_timestamp
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the cast to timestamp expression in a query.
+sql_engine: Snowflake
 ---
 -- Test Cast to Timestamp Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_continuous_percentile_expr__plan0.sql
index 0aefd17ee..84394e491 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_continuous_percentile_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_continuous_percentile_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_continuous_percentile_expr
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the continuous percentile expression in a query.
+sql_engine: Snowflake
 ---
 -- Test Continuous Percentile Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_discrete_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_discrete_percentile_expr__plan0.sql
index 0f2777722..a7a7ccf17 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_discrete_percentile_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_discrete_percentile_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_discrete_percentile_expr
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the discrete percentile expression in a query.
+sql_engine: Snowflake
 ---
 -- Test Discrete Percentile Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_generate_uuid__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_generate_uuid__plan0.sql
index 065eb53bd..7666e1059 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_generate_uuid__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Snowflake/test_generate_uuid__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_generate_uuid
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the generate uuid expression in a query.
+sql_engine: Snowflake
 ---
 -- Test Generate UUID Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_approximate_continuous_percentile_expr__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_approximate_continuous_percentile_expr__plan0.sql
index d0a3f41b4..d9a39fdeb 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_approximate_continuous_percentile_expr__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_approximate_continuous_percentile_expr__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_approximate_continuous_percentile_expr
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the approximate continuous percentile expression in a query.
+sql_engine: Trino
 ---
 -- Test Approximate Continuous Percentile Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_cast_to_timestamp__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_cast_to_timestamp__plan0.sql
index 2469a78b8..57fe4fbe2 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_cast_to_timestamp__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_cast_to_timestamp__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_cast_to_timestamp
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the cast to timestamp expression in a query.
+sql_engine: Trino
 ---
 -- Test Cast to Timestamp Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_generate_uuid__plan0.sql b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_generate_uuid__plan0.sql
index 582f5dd70..095741a66 100644
--- a/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_generate_uuid__plan0.sql
+++ b/tests_metricflow/snapshots/test_engine_specific_rendering.py/SqlQueryPlan/Trino/test_generate_uuid__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_generate_uuid
 test_filename: test_engine_specific_rendering.py
 docstring:
   Tests rendering of the generate uuid expression in a query.
+sql_engine: Trino
 ---
 -- Test Generate UUID Expression
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_fill_nulls__plan0.sql
index 528803ac8..c404022d3 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_fill_nulls__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_fill_nulls__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_fill_nulls
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_fill_nulls__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_fill_nulls__plan0_optimized.sql
index 91e90a624..ff83eff86 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_fill_nulls__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_fill_nulls__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_fill_nulls
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0.sql
index 26209f1d2..7acac83ff 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_fill_nulls_for_one_input_metric
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
index 2f3fd5cfd..576edf228 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_fill_nulls_for_one_input_metric
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
index 935306dc8..a8e3e965b 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
index dc5c35579..48f25f07b 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
index 757604750..6d72922e2 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
index f12334dcc..6e6107644 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
index 910a25a88..1a8ded709 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
index c2fd97c40..da1bdd42a 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
index 59233fa9f..fd8e519d9 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_smaller_than_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
index dd3f1f135..8f69843cf 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_smaller_than_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filters__plan0.sql
index 644f18120..c24364d91 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filters__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filters
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filters__plan0_optimized.sql
index 47a8ef1df..608c5e71c 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_filters__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filters
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0.sql
index ef9d67a61..40a7c4ae4 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
index 5f28fcf22..9cd507a22 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0.sql
index a909a747b..7a3dd562b 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_month
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
index f3fb4e48a..c2376e8ec 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_month
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
index d815ceaa1..bf52dfb32 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_categorical_dimension
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
index af9628fe6..ced94edb1 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_categorical_dimension
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
index b49dad1da..7f1215d21 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_non_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
index 94e6f975a..c48d0acf7 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_non_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_without_time_spine__plan0.sql
index 754336100..b963cb6b0 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_without_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_without_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_without_time_spine
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
index 4dfd41cbf..13292e91a 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/BigQuery/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_without_time_spine
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_cumulative_fill_nulls__plan0.sql
index 53f01f465..65d6cd95c 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_cumulative_fill_nulls__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_cumulative_fill_nulls__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_fill_nulls
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_cumulative_fill_nulls__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_cumulative_fill_nulls__plan0_optimized.sql
index 7944254e5..f402f4015 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_cumulative_fill_nulls__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_cumulative_fill_nulls__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_fill_nulls
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0.sql
index f8c04bb1f..aea9aa107 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_fill_nulls_for_one_input_metric
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
index ccc4a9a22..ba9e282ec 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_fill_nulls_for_one_input_metric
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
index d557ecc5f..423476439 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
index b5fb654a3..29e2f814e 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
index bd2fb70a1..1c0867306 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
index 369a0ab4d..b0965aa8f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
index 18abd4b89..363eabf78 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
index 86888fbb0..709f8964f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
index d873e45a8..f4d1e06c4 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_smaller_than_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
index c38bcc1ef..a45cc35bf 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_smaller_than_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filters__plan0.sql
index bcd535440..8a9b75dbc 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filters__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filters
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filters__plan0_optimized.sql
index c53a7868e..85b681ed1 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_filters__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filters
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0.sql
index e2c91df52..57859556a 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
index 26419b399..179c2b34b 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0.sql
index b63896769..3d061d0ca 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_month
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
index 58386963a..cad63ffc2 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_month
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
index 1cfee4a09..165df7646 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_categorical_dimension
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
index af9628fe6..c244c43ad 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_categorical_dimension
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
index 214c13af5..6b010668b 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_non_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
index b41a89b1b..504d4b82c 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_non_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_without_time_spine__plan0.sql
index d61a2da56..4998d5a93 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_without_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_without_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_without_time_spine
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
index 3676eb34f..10c58d09b 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Databricks/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_without_time_spine
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_fill_nulls__plan0.sql
index b0d4319e4..f51bc92cd 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_fill_nulls__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_fill_nulls__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_fill_nulls
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_fill_nulls__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_fill_nulls__plan0_optimized.sql
index b3e9d4f55..1f7ba0288 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_fill_nulls__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_fill_nulls__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_fill_nulls
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0.sql
index 31af9cb53..7b7c3d944 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_fill_nulls_for_one_input_metric
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
index f27fb8676..31ebdbb9f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_fill_nulls_for_one_input_metric
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
index e2c0b97a5..405f5389f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
index b5fb654a3..36b08d6cc 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
index b36adbc96..5acdc0fe1 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
index 369a0ab4d..909a549a6 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
index c1c476931..f1fe46de6 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
index 86888fbb0..c734f4432 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
index 629e1ec29..9f67dd098 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_smaller_than_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
index c38bcc1ef..2d0e79cb4 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_smaller_than_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filters__plan0.sql
index 356140afa..5e28dd30d 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filters__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filters
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filters__plan0_optimized.sql
index c53a7868e..ce76f5c6d 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_filters__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filters
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0.sql
index ec94c43c2..7dc980cc2 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
index 26419b399..30f3bf383 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0.sql
index bd5fbe0b0..093f5cb1f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_month
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
index 58386963a..d1ff9ab0f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_month
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
index 27c3df192..0b1bc8b75 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_categorical_dimension
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
index af9628fe6..89b90151d 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_categorical_dimension
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
index 7058e4bcd..762cd087c 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_non_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
index b41a89b1b..e9cf72853 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_non_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_without_time_spine__plan0.sql
index f614ca9fa..a482e29f3 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_without_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_without_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_without_time_spine
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
index 3676eb34f..d0b3489ab 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/DuckDB/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_without_time_spine
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_cumulative_fill_nulls__plan0.sql
index 3534a97b8..4e69fac48 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_cumulative_fill_nulls__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_cumulative_fill_nulls__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_fill_nulls
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_cumulative_fill_nulls__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_cumulative_fill_nulls__plan0_optimized.sql
index cbcb9b8ee..4881dd460 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_cumulative_fill_nulls__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_cumulative_fill_nulls__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_fill_nulls
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0.sql
index 0845aba47..9dce854a0 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_fill_nulls_for_one_input_metric
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
index 960da0501..44671f824 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_fill_nulls_for_one_input_metric
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
index e2c0b97a5..9d50c2dea 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
index b5fb654a3..d5416c5e6 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
index b36adbc96..5dc0c4871 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
index 369a0ab4d..5ee3282bc 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
index c1c476931..dc045898e 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
index 86888fbb0..883595185 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
index 629e1ec29..b666878d8 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_smaller_than_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
index c38bcc1ef..5ab18850f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_smaller_than_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filters__plan0.sql
index 356140afa..00a15dbaf 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filters__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filters
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filters__plan0_optimized.sql
index c53a7868e..332fcb733 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_filters__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filters
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0.sql
index ec94c43c2..807f47a72 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
index 26419b399..e5ad631c9 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0.sql
index bd5fbe0b0..30b2acb5c 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_month
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
index 58386963a..a1505e966 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_month
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
index 27c3df192..527ff4ca6 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_categorical_dimension
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
index af9628fe6..3cea77dad 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_categorical_dimension
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
index 7058e4bcd..8f68b02ff 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_non_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
index b41a89b1b..879da5480 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_non_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_without_time_spine__plan0.sql
index f614ca9fa..4bbe588f7 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_without_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_without_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_without_time_spine
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
index 3676eb34f..5d282141c 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Postgres/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_without_time_spine
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_cumulative_fill_nulls__plan0.sql
index 659cab22c..4a7136655 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_cumulative_fill_nulls__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_cumulative_fill_nulls__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_fill_nulls
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_cumulative_fill_nulls__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_cumulative_fill_nulls__plan0_optimized.sql
index 7944254e5..cff38d699 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_cumulative_fill_nulls__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_cumulative_fill_nulls__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_fill_nulls
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0.sql
index 5fabb9efe..076e11a11 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_fill_nulls_for_one_input_metric
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
index ccc4a9a22..25e33fd18 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_fill_nulls_for_one_input_metric
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
index 4ffa0ba16..6304c9b61 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
index b5fb654a3..b971d2961 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
index e694d1365..2a0c2ceea 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
index 369a0ab4d..f0a4d3c29 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
index e76111312..e04e39ded 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
index 86888fbb0..fe3be6213 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
index 9aa5dc5c3..1e3180ba3 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_smaller_than_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
index c38bcc1ef..df0c8e2cd 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_smaller_than_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filters__plan0.sql
index d289e6682..7e60df24f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filters__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filters
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filters__plan0_optimized.sql
index c53a7868e..6580a9789 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_filters__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filters
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0.sql
index a9889e998..4e00a3506 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
index 26419b399..98fb58c9c 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0.sql
index 5ff57ada2..da9da08ef 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_month
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
index 58386963a..d180052cb 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_month
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
index 5588df706..83c635da4 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_categorical_dimension
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
index af9628fe6..f71930dc7 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_categorical_dimension
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
index abc34c966..1b8468197 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_non_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
index b41a89b1b..be67b385c 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_non_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_without_time_spine__plan0.sql
index 5ddb2c9c4..cf95199d9 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_without_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_without_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_without_time_spine
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
index 3676eb34f..e9b5e6a12 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Redshift/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_without_time_spine
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_fill_nulls__plan0.sql
index 369aa72b9..04b6aaf9d 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_fill_nulls__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_fill_nulls__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_fill_nulls
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_fill_nulls__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_fill_nulls__plan0_optimized.sql
index 7944254e5..3fc6b83ac 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_fill_nulls__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_fill_nulls__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_fill_nulls
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0.sql
index d0e544331..0b707cdc0 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_fill_nulls_for_one_input_metric
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
index ccc4a9a22..34a698d3f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_fill_nulls_for_one_input_metric
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
index e8678dd51..687ba257e 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
index b5fb654a3..d4d3f30ee 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
index ca6f50821..3dd7c86d3 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
index 369a0ab4d..f592c4814 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
index ca7e1e1e9..90a6ffb4d 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
index 86888fbb0..f79462027 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
index 96c0167f4..55ca26300 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_smaller_than_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
index c38bcc1ef..6f898cc9f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_smaller_than_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filters__plan0.sql
index 41d0bc584..e87146e74 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filters__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filters
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filters__plan0_optimized.sql
index c53a7868e..24a046f07 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_filters__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filters
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0.sql
index e4e7fea16..9df453c12 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
index 26419b399..c1e9df528 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0.sql
index 0588ecce2..72e2f2262 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_month
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
index 58386963a..61da61b2b 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_month
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
index f7eff316f..d8e6d2f84 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_categorical_dimension
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
index af9628fe6..7943c5ced 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_categorical_dimension
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
index 547a9b8dc..caf91cc9e 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_non_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
index b41a89b1b..a7e9426a4 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_non_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_without_time_spine__plan0.sql
index 7f2eb5528..f1c437a77 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_without_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_without_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_without_time_spine
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
index 3676eb34f..3de2e3177 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Snowflake/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_without_time_spine
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_cumulative_fill_nulls__plan0.sql
index 7ff0ce68c..eda72125e 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_cumulative_fill_nulls__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_cumulative_fill_nulls__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_fill_nulls
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_cumulative_fill_nulls__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_cumulative_fill_nulls__plan0_optimized.sql
index 1ee69a66c..4d68df91c 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_cumulative_fill_nulls__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_cumulative_fill_nulls__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_cumulative_fill_nulls
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0.sql
index 9283a52ed..fa437bc1f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_fill_nulls_for_one_input_metric
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
index 009942e36..45f332582 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_derived_fill_nulls_for_one_input_metric
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
index 8b70c31e1..3a5010db2 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
index b5fb654a3..7e815038e 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
index b565a1758..6239e8a6f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
index 369a0ab4d..692c69005 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
index 7b7d32195..cab98b4d7 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
index 86888fbb0..301f1b0a7 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
index 0e0d4af11..e19a79f12 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_smaller_than_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
index c38bcc1ef..a37557117 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filter_smaller_than_group_by__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filter_smaller_than_group_by
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filters__plan0.sql
index 774303a4f..3f691ffa2 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filters__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filters
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filters__plan0_optimized.sql
index 8c7c568ec..e56169103 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_filters__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_join_to_time_spine_with_filters
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0.sql
index 5f7c3c5e4..393e0348f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
index 26419b399..1d62fa0a8 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_month__plan0.sql
index efd2498e3..17789fb97 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_month__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_month__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_month
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_month__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
index 58386963a..844d0d2eb 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_month__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_month
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
index a5911484a..63883ebe6 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_categorical_dimension
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
index af9628fe6..49e0cabc6 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_categorical_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_categorical_dimension
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
index 8b76bc0a0..a6e126e5f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_non_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_non_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
index b41a89b1b..d8e7d6444 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_with_0_with_non_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_with_0_with_non_metric_time
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_without_time_spine__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_without_time_spine__plan0.sql
index a55e035d1..5291e2061 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_without_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_without_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_without_time_spine
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
index 3676eb34f..0bea97e2f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlQueryPlan/Trino/test_simple_fill_nulls_without_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_fill_nulls_without_time_spine
 test_filename: test_fill_nulls_with_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0.sql
index b7ff910cc..b8e42a253 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0_optimized.sql
index 5799b380e..6aad32a7f 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
index 56e2ed616..ccadb64f1 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_joined_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
index 1b8c4625c..e8fcc992f 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_joined_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__user__bio_added_ts__minute']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_sub_daily_dimension__plan0.sql
index c8bc97a3e..fd53d75cf 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
index bbd672333..059bf2155 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0.sql
index 6a68f4f24..c4bf336d2 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0_optimized.sql
index f971b278d..6c2293687 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0.sql
index 8dea37c87..ba2e061a6 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_multiple_date_parts
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
index 8cefe18c8..cfb80ce63 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_multiple_date_parts
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_dimension__plan0.sql
index 0bdb902c5..21e873f9f 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['user__bio_added_ts__second',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_dimension__plan0_optimized.sql
index 00cf82046..344e0df46 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Read Elements From Semantic Model 'users_ds_source'
 -- Pass Only Elements: ['user__bio_added_ts__second',]
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_metric_time__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_metric_time__plan0.sql
index 8ec068d54..3f4a666ca 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_metric_time
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['metric_time__millisecond',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_metric_time__plan0_optimized.sql
index 7561843f0..43941758a 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_sub_daily_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_metric_time
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Time Spine
 -- Metric Time Dimension 'ts'
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_grain_to_date_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
index 528c540f1..7a8fb6d64 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_grain_to_date_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
index 8c12f78ff..f1bbd324f 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_grain_to_date_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['archived_users', 'metric_time__hour']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_window_metric__plan0.sql
index 8f7489433..ebbdb47f7 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_window_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_window_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_window_metric__plan0_optimized.sql
index eb12e75f6..a5ee904c2 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_window_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_cumulative_window_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['archived_users', 'metric_time__hour']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
index 1e5d7aa99..f420f440b 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_granularity_overrides_metric_default_granularity
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
index cd562d877..f1ce4bf13 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_granularity_overrides_metric_default_granularity
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_join_to_time_spine_metric__plan0.sql
index e5f41b987..65b2cf183 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_join_to_time_spine_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_join_to_time_spine_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_join_to_time_spine_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
index 385895692..96e2502fd 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_join_to_time_spine_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_to_grain_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_to_grain_metric__plan0.sql
index 8df49cb6a..285492d2d 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_to_grain_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_to_grain_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_to_grain_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_to_grain_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
index 45dbc79dd..5a9219415 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_to_grain_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_window_metric__plan0.sql
index 6be2ba1b1..0d5ad10ca 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_window_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_window_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_window_metric__plan0_optimized.sql
index 7d3ed4f6e..7997b120d 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_window_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_offset_window_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_with_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_with_metric__plan0.sql
index f51adba96..654596a31 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_with_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_with_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_with_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_with_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
index 30648c81d..b3ea5105c 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_with_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Join to Time Spine Dataset
 -- Constrain Time Range to [2020-01-01T02:00:00, 2020-01-01T05:00:00]
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_without_metrics__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_without_metrics__plan0.sql
index a7e187be9..7ab555ead 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_without_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_without_metrics__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_without_metrics
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['metric_time__second',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
index 700a5d969..6743f0f22 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/BigQuery/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_without_metrics
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: BigQuery
 ---
 -- Time Spine
 -- Metric Time Dimension 'ts'
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0.sql
index f999e809b..c068eb504 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0_optimized.sql
index ed7ec0cd0..fcbbcc1ba 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
index 73ab4742c..c4bafd814 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_joined_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
index 8ea2afaa4..08f375cc7 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_joined_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__user__bio_added_ts__minute']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_sub_daily_dimension__plan0.sql
index 9f10f02b6..20e0c1fad 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
index 0f3335a2c..a7653de52 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0.sql
index cc3ac79ba..2bb7384f9 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0_optimized.sql
index 7eb773af7..de819b88e 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0.sql
index 9e84a54bd..b0892737c 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_multiple_date_parts
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
index 3ae1a7211..24f5e13ef 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_multiple_date_parts
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_dimension__plan0.sql
index 548800745..c22cfd541 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['user__bio_added_ts__second',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_dimension__plan0_optimized.sql
index c132b691a..013f8d7dd 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Read Elements From Semantic Model 'users_ds_source'
 -- Pass Only Elements: ['user__bio_added_ts__second',]
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_metric_time__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_metric_time__plan0.sql
index 5cf25d5ed..4d59db14d 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_metric_time
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['metric_time__millisecond',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_metric_time__plan0_optimized.sql
index 7ed0e0409..ac4b3016a 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_sub_daily_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_metric_time
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Time Spine
 -- Metric Time Dimension 'ts'
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_grain_to_date_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
index 56c141df9..1d2b5583d 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_grain_to_date_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
index 7ff7e6834..07bb3e360 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_grain_to_date_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['archived_users', 'metric_time__hour']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_window_metric__plan0.sql
index 02d8ff301..42db2280f 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_window_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_window_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_window_metric__plan0_optimized.sql
index fcf26f2e6..0e47002f3 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_window_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_cumulative_window_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['archived_users', 'metric_time__hour']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
index 2414c2a35..5917a1ec3 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_granularity_overrides_metric_default_granularity
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
index ada31ddc9..d0280d8ec 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_granularity_overrides_metric_default_granularity
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_join_to_time_spine_metric__plan0.sql
index c9c8abb0f..1d1ac00f4 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_join_to_time_spine_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_join_to_time_spine_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_join_to_time_spine_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
index 6d1d918e4..95cde0677 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_join_to_time_spine_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_to_grain_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_to_grain_metric__plan0.sql
index e72e23528..5a98cbfc6 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_to_grain_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_to_grain_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_to_grain_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_to_grain_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
index 195dfae1b..a2be431b3 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_to_grain_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_window_metric__plan0.sql
index b589d0aaf..e387ad907 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_window_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_window_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_window_metric__plan0_optimized.sql
index 5a102fe24..33ac7b7e6 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_window_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_offset_window_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_with_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_with_metric__plan0.sql
index 0fe934fb0..15a2229f8 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_with_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_with_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_with_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_with_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
index 403b8b1ba..5049b955a 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_with_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Join to Time Spine Dataset
 -- Constrain Time Range to [2020-01-01T02:00:00, 2020-01-01T05:00:00]
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_without_metrics__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_without_metrics__plan0.sql
index b70096eb2..577f3b83c 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_without_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_without_metrics__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_without_metrics
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['metric_time__second',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
index 7fb8cacb9..33208b554 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Databricks/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_without_metrics
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Databricks
 ---
 -- Time Spine
 -- Metric Time Dimension 'ts'
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0.sql
index a189cfb87..ac7f40a37 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0_optimized.sql
index ab6ae3d30..475bffcec 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
index 1ebf8886a..6fa0b2a72 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_joined_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
index 8ea2afaa4..0e9ca352a 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_joined_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__user__bio_added_ts__minute']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_sub_daily_dimension__plan0.sql
index 0a8672b51..fccba838c 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
index 0f3335a2c..a86172bf9 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0.sql
index a36c505db..6e8d7b846 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0_optimized.sql
index df79b4580..08617d5b9 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0.sql
index 4baf5c4cf..8a8639137 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_multiple_date_parts
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
index 32be92b6d..3a17ec4fd 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_multiple_date_parts
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_dimension__plan0.sql
index 9ff61f6f5..6fcf88cb4 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['user__bio_added_ts__second',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_dimension__plan0_optimized.sql
index c132b691a..7735b0a5b 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Read Elements From Semantic Model 'users_ds_source'
 -- Pass Only Elements: ['user__bio_added_ts__second',]
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_metric_time__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_metric_time__plan0.sql
index 337837b00..8b6a01cd8 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_metric_time
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['metric_time__millisecond',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_metric_time__plan0_optimized.sql
index 7ed0e0409..f7e55b1e4 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_sub_daily_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_metric_time
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Time Spine
 -- Metric Time Dimension 'ts'
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_grain_to_date_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
index b4445c076..3d5ab8bd2 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_grain_to_date_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
index 7ff7e6834..cb7a196d3 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_grain_to_date_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['archived_users', 'metric_time__hour']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_window_metric__plan0.sql
index 2bcb33e14..a837428a6 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_window_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_window_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_window_metric__plan0_optimized.sql
index 8706d5026..4961dbf08 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_window_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_cumulative_window_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['archived_users', 'metric_time__hour']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
index 3e08dc04b..3aa80628b 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_granularity_overrides_metric_default_granularity
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
index ada31ddc9..cb9fd532c 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_granularity_overrides_metric_default_granularity
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_join_to_time_spine_metric__plan0.sql
index 5a4481aa9..8320aacaf 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_join_to_time_spine_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_join_to_time_spine_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_join_to_time_spine_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
index 6d1d918e4..de002a8a6 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_join_to_time_spine_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_to_grain_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_to_grain_metric__plan0.sql
index 5f4fd4758..b526a04bc 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_to_grain_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_to_grain_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_to_grain_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_to_grain_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
index 195dfae1b..a13ee4f4c 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_to_grain_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_window_metric__plan0.sql
index c3ad9f6a2..22151fa06 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_window_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_window_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_window_metric__plan0_optimized.sql
index f1d8b8908..78923e04e 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_window_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_offset_window_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_with_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_with_metric__plan0.sql
index 316205ab8..e3d1ee7ad 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_with_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_with_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_with_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_with_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
index 403b8b1ba..315d5897c 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_with_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Join to Time Spine Dataset
 -- Constrain Time Range to [2020-01-01T02:00:00, 2020-01-01T05:00:00]
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_without_metrics__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_without_metrics__plan0.sql
index 18b45c88a..1d8984e91 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_without_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_without_metrics__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_without_metrics
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['metric_time__second',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
index 7fb8cacb9..a8b4e6e0d 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/DuckDB/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_without_metrics
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: DuckDB
 ---
 -- Time Spine
 -- Metric Time Dimension 'ts'
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0.sql
index 142784ff6..32bcbd547 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0_optimized.sql
index aa2cf9a06..5e0bf2bbc 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
index 1ebf8886a..40739859b 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_joined_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
index 8ea2afaa4..551f2e641 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_joined_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__user__bio_added_ts__minute']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_sub_daily_dimension__plan0.sql
index 0a8672b51..39735263a 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
index 0f3335a2c..bb355337a 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0.sql
index a36c505db..cdd5d790d 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0_optimized.sql
index df79b4580..2a96a8b82 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0.sql
index 4baf5c4cf..43dcd4c58 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_multiple_date_parts
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
index 32be92b6d..ab3bc1fa4 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_multiple_date_parts
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_dimension__plan0.sql
index 9ff61f6f5..e24bdcb99 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['user__bio_added_ts__second',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_dimension__plan0_optimized.sql
index c132b691a..4e84c7a97 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Read Elements From Semantic Model 'users_ds_source'
 -- Pass Only Elements: ['user__bio_added_ts__second',]
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_metric_time__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_metric_time__plan0.sql
index 337837b00..87f9caca3 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_metric_time
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['metric_time__millisecond',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_metric_time__plan0_optimized.sql
index 7ed0e0409..0f9e74c7d 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_sub_daily_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_metric_time
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Time Spine
 -- Metric Time Dimension 'ts'
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_grain_to_date_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
index b4445c076..f3812b5d8 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_grain_to_date_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
index 7ff7e6834..0065a70ed 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_grain_to_date_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['archived_users', 'metric_time__hour']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_window_metric__plan0.sql
index 0f2aa97c7..a1774f568 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_window_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_window_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_window_metric__plan0_optimized.sql
index 7c8099f39..6a8a21a9f 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_window_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_cumulative_window_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['archived_users', 'metric_time__hour']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
index 3e08dc04b..f7b7aff73 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_granularity_overrides_metric_default_granularity
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
index ada31ddc9..07c19ae30 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_granularity_overrides_metric_default_granularity
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_join_to_time_spine_metric__plan0.sql
index 5a4481aa9..bdb394410 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_join_to_time_spine_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_join_to_time_spine_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_join_to_time_spine_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
index 6d1d918e4..e4ddf574a 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_join_to_time_spine_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_to_grain_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_to_grain_metric__plan0.sql
index 5f4fd4758..c78bda1e0 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_to_grain_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_to_grain_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_to_grain_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_to_grain_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
index 195dfae1b..4ebee052c 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_to_grain_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_window_metric__plan0.sql
index 1d78f468b..fa73c87f4 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_window_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_window_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_window_metric__plan0_optimized.sql
index 6688d2955..41dd8e327 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_window_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_offset_window_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_with_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_with_metric__plan0.sql
index 316205ab8..042d67e58 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_with_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_with_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_with_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_with_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
index 403b8b1ba..44a55dcc5 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_with_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Join to Time Spine Dataset
 -- Constrain Time Range to [2020-01-01T02:00:00, 2020-01-01T05:00:00]
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_without_metrics__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_without_metrics__plan0.sql
index 18b45c88a..5930d28cd 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_without_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_without_metrics__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_without_metrics
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['metric_time__second',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
index 7fb8cacb9..f2ebaeeb1 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Postgres/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_without_metrics
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Postgres
 ---
 -- Time Spine
 -- Metric Time Dimension 'ts'
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0.sql
index 43745b701..a23d8fe08 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0_optimized.sql
index 4a9fa6647..c2b638224 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
index 609c737b6..506398147 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_joined_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
index 8ea2afaa4..f86d77a4c 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_joined_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__user__bio_added_ts__minute']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_sub_daily_dimension__plan0.sql
index 74f4f7a84..a2b4a8d8d 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
index 0f3335a2c..beac289e1 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0.sql
index 8e0022ad4..610fb02cd 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0_optimized.sql
index 372afd9a4..8b9fe002c 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0.sql
index dd0e872b7..fb0a9463c 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_multiple_date_parts
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
index 6803409d5..5fef06eaa 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_multiple_date_parts
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_dimension__plan0.sql
index 1f53b95a0..2f97a1be5 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['user__bio_added_ts__second',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_dimension__plan0_optimized.sql
index c132b691a..337731910 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Read Elements From Semantic Model 'users_ds_source'
 -- Pass Only Elements: ['user__bio_added_ts__second',]
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_metric_time__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_metric_time__plan0.sql
index 48c4c8f83..ddcdb5c23 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_metric_time
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['metric_time__millisecond',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_metric_time__plan0_optimized.sql
index 7ed0e0409..25a5c8ba1 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_sub_daily_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_metric_time
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Time Spine
 -- Metric Time Dimension 'ts'
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_grain_to_date_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
index 6d018c861..fa2de1dbf 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_grain_to_date_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
index 7ff7e6834..d99697cd7 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_grain_to_date_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['archived_users', 'metric_time__hour']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_window_metric__plan0.sql
index de82f41bd..cc6473903 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_window_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_window_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_window_metric__plan0_optimized.sql
index fcf26f2e6..584c33682 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_window_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_cumulative_window_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['archived_users', 'metric_time__hour']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
index d1397142d..850947acd 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_granularity_overrides_metric_default_granularity
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
index ada31ddc9..453237b4f 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_granularity_overrides_metric_default_granularity
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_join_to_time_spine_metric__plan0.sql
index f39f9ea42..53a589e4c 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_join_to_time_spine_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_join_to_time_spine_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_join_to_time_spine_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
index 6d1d918e4..0c0b432a2 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_join_to_time_spine_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_to_grain_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_to_grain_metric__plan0.sql
index 6b7bace61..9dd587159 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_to_grain_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_to_grain_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_to_grain_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_to_grain_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
index 195dfae1b..7b1ea188a 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_to_grain_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_window_metric__plan0.sql
index 6a6ea775f..408983c56 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_window_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_window_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_window_metric__plan0_optimized.sql
index 5a102fe24..eeb440b35 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_window_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_offset_window_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_with_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_with_metric__plan0.sql
index ebbf4c72a..d4e7c62b3 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_with_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_with_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_with_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_with_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
index 403b8b1ba..b5731e20f 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_with_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Join to Time Spine Dataset
 -- Constrain Time Range to [2020-01-01T02:00:00, 2020-01-01T05:00:00]
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_without_metrics__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_without_metrics__plan0.sql
index 0ec3aaa8d..1bda1970d 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_without_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_without_metrics__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_without_metrics
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['metric_time__second',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
index 7fb8cacb9..94885bcea 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Redshift/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_without_metrics
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Redshift
 ---
 -- Time Spine
 -- Metric Time Dimension 'ts'
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0.sql
index 1009567e6..10c17d8dc 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0_optimized.sql
index 1e30b366b..656edaf9f 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
index d86e7fc2f..d14893b5a 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_joined_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
index 8ea2afaa4..5068bb990 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_joined_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__user__bio_added_ts__minute']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_sub_daily_dimension__plan0.sql
index 63f42b6cd..9c1225c84 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
index 0f3335a2c..6a8ebf4fc 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0.sql
index 243337a11..4f0ea2773 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0_optimized.sql
index 7190e17bc..97ec8263d 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0.sql
index e6181ae64..198652347 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_multiple_date_parts
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
index 8b2b458de..8d7333616 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_multiple_date_parts
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_dimension__plan0.sql
index 05331aa8c..ce138c346 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['user__bio_added_ts__second',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_dimension__plan0_optimized.sql
index c132b691a..d2b77798a 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Read Elements From Semantic Model 'users_ds_source'
 -- Pass Only Elements: ['user__bio_added_ts__second',]
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_metric_time__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_metric_time__plan0.sql
index 30d20438b..97f83b8de 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_metric_time
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['metric_time__millisecond',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_metric_time__plan0_optimized.sql
index 7ed0e0409..b7217f464 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_sub_daily_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_metric_time
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Time Spine
 -- Metric Time Dimension 'ts'
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_grain_to_date_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
index 892cb391d..6f0f3aa58 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_grain_to_date_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
index 7ff7e6834..6cd32b7d9 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_grain_to_date_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['archived_users', 'metric_time__hour']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_window_metric__plan0.sql
index e639429bd..8039468eb 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_window_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_window_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_window_metric__plan0_optimized.sql
index fcf26f2e6..af0fa1315 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_window_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_cumulative_window_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['archived_users', 'metric_time__hour']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
index 2d24e2db3..31cc70811 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_granularity_overrides_metric_default_granularity
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
index ada31ddc9..2eeeed0e1 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_granularity_overrides_metric_default_granularity
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_join_to_time_spine_metric__plan0.sql
index 880bd7f1b..07deada39 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_join_to_time_spine_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_join_to_time_spine_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_join_to_time_spine_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
index 6d1d918e4..df5043613 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_join_to_time_spine_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_to_grain_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_to_grain_metric__plan0.sql
index c17d01e7b..96980f433 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_to_grain_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_to_grain_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_to_grain_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_to_grain_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
index 195dfae1b..0ac8b2525 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_to_grain_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_window_metric__plan0.sql
index e48b84ad8..ea392fffb 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_window_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_window_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_window_metric__plan0_optimized.sql
index 5a102fe24..0ee8b61db 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_window_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_offset_window_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_with_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_with_metric__plan0.sql
index 686dd5150..9cb2320ca 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_with_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_with_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_with_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_with_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
index 403b8b1ba..b6f507187 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_with_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Join to Time Spine Dataset
 -- Constrain Time Range to [2020-01-01T02:00:00, 2020-01-01T05:00:00]
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_without_metrics__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_without_metrics__plan0.sql
index f71526724..bcd5ef986 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_without_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_without_metrics__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_without_metrics
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['metric_time__second',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
index 7fb8cacb9..743896a7a 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Snowflake/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_without_metrics
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Snowflake
 ---
 -- Time Spine
 -- Metric Time Dimension 'ts'
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_date_part__plan0.sql
index ebbec0761..adf84a41b 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_date_part__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_date_part__plan0_optimized.sql
index 848854097..4def88a76 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_offset_window_with_date_part__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_offset_window_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
index 401992812..9349db965 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_joined_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_joined_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
index 8ea2afaa4..55b205d45 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_joined_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_joined_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__user__bio_added_ts__minute']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_sub_daily_dimension__plan0.sql
index 54ebac47f..9d0ff2e8d 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
index 0f3335a2c..4ebb1997d 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_metric_with_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_metric_with_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_date_part__plan0.sql
index abac6ae29..b42a3dae8 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_date_part__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_date_part__plan0_optimized.sql
index 1f9a8df9f..2bd7ebe94 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_date_part__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_date_part
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_multiple_date_parts__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_multiple_date_parts__plan0.sql
index 77bd5d381..63421060a 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_multiple_date_parts__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_multiple_date_parts__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_multiple_date_parts
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
index 0ddec86c8..7f7591a70 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_query_with_multiple_date_parts
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_dimension__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_dimension__plan0.sql
index 3ec47dc6d..890c0b971 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_dimension__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['user__bio_added_ts__second',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_dimension__plan0_optimized.sql
index c132b691a..78ac658ae 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_dimension__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_dimension
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Read Elements From Semantic Model 'users_ds_source'
 -- Pass Only Elements: ['user__bio_added_ts__second',]
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_metric_time__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_metric_time__plan0.sql
index e071b7865..05862c35a 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_metric_time__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_metric_time
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['metric_time__millisecond',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_metric_time__plan0_optimized.sql
index 7ed0e0409..5c2d609a0 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_sub_daily_metric_time__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_sub_daily_metric_time
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Time Spine
 -- Metric Time Dimension 'ts'
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_grain_to_date_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
index b5e086af4..48a532f3e 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_grain_to_date_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_grain_to_date_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
index 7ff7e6834..6bc69e83a 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_grain_to_date_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_grain_to_date_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['archived_users', 'metric_time__hour']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_window_metric__plan0.sql
index 4280922c2..1d8190ca9 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_window_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_window_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_window_metric__plan0_optimized.sql
index 7f2bf33c4..d06ecbc6f 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_window_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_cumulative_window_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_cumulative_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Join Self Over Time Range
 -- Pass Only Elements: ['archived_users', 'metric_time__hour']
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
index c72b50d43..5a119a94c 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_granularity_overrides_metric_default_granularity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_granularity_overrides_metric_default_granularity
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
index ada31ddc9..5a6cc1257 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_granularity_overrides_metric_default_granularity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_granularity_overrides_metric_default_granularity
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_join_to_time_spine_metric__plan0.sql
index 7b60ff9ef..e4367301d 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_join_to_time_spine_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_join_to_time_spine_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_join_to_time_spine_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
index 6d1d918e4..ab20d4c19 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_join_to_time_spine_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_join_to_time_spine_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_to_grain_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_to_grain_metric__plan0.sql
index f509fbc2b..d60b3bac0 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_to_grain_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_to_grain_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_to_grain_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_to_grain_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
index 195dfae1b..6eca0ddc3 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_to_grain_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_to_grain_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_window_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_window_metric__plan0.sql
index 061aab914..8a7f7a0b1 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_window_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_window_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_window_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_window_metric__plan0_optimized.sql
index e1006a479..f51d27ebe 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_window_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_offset_window_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_offset_window_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_with_metric__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_with_metric__plan0.sql
index 36f535e73..82e591b56 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_with_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_with_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_with_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_with_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
index 1ea255087..7a6d60c97 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_with_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_with_metric
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Join to Time Spine Dataset
 -- Constrain Time Range to [2020-01-01T02:00:00, 2020-01-01T05:00:00]
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_without_metrics__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_without_metrics__plan0.sql
index adb6dfc9a..d58085ff0 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_without_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_without_metrics__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_without_metrics
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['metric_time__second',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
index 6ee6c515c..6acd6374e 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlQueryPlan/Trino/test_subdaily_time_constraint_without_metrics__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_subdaily_time_constraint_without_metrics
 test_filename: test_granularity_date_part_rendering.py
+sql_engine: Trino
 ---
 -- Time Spine
 -- Metric Time Dimension 'ts'
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values_query_with_metric_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values_query_with_metric_filter__plan0.sql
index c7e86f2da..c4d5dabf2 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values_query_with_metric_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values_query_with_metric_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values_query_with_metric_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a distinct values query with a metric in the query-level where filter.
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['listing',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values_query_with_metric_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
index 5fb0a0325..f291600e6 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values_query_with_metric_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a distinct values query with a metric in the query-level where filter.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
index 047e508ef..27542fa93 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_by_metric_in_same_semantic_model_as_queried_metric
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
index 85799c722..5166802d9 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_by_metric_in_same_semantic_model_as_queried_metric
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_conversion_metric__plan0.sql
index 0fc7867e4..7634a0930 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_conversion_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_conversion_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_filter_with_conversion_metric
 test_filename: test_metric_filter_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_conversion_metric__plan0_optimized.sql
index 46e8e2137..72abea640 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_conversion_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_conversion_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_filter_with_conversion_metric
 test_filename: test_metric_filter_rendering.py
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix__plan0.sql
index ea8d658e3..231820dc2 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_group_by_has_local_entity_prefix
 test_filename: test_metric_filter_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix__plan0_optimized.sql
index 9254787f3..74a410722 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_group_by_has_local_entity_prefix__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_group_by_has_local_entity_prefix
 test_filename: test_metric_filter_rendering.py
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_multi_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_multi_hop__plan0.sql
index 476f4c662..55fda318d 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_multi_hop__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_multi_hop__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_multi_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a two-hop join in the inner query.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_multi_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_multi_hop__plan0_optimized.sql
index 0ca600504..4871deb40 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_multi_hop__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_multi_hop__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_multi_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a two-hop join in the inner query.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['third_hop_count',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_single_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_single_hop__plan0.sql
index f4aeac698..bd21e6c2e 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_single_hop__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_single_hop__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_single_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a one-hop join in the inner query.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_single_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_single_hop__plan0_optimized.sql
index b770931cd..e5c386cf6 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_single_hop__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_inner_query_single_hop__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_single_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a one-hop join in the inner query.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['third_hop_count',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_filtered_by_itself__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_filtered_by_itself__plan0.sql
index ab1109944..b2434154f 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_filtered_by_itself__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_filtered_by_itself__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_filtered_by_itself
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query for a metric that filters by the same metric.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_filtered_by_itself__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_filtered_by_itself__plan0_optimized.sql
index 30927f92e..eb9387e67 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_filtered_by_itself__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_filtered_by_itself__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_filtered_by_itself
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query for a metric that filters by the same metric.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_metric_in_where_filter__plan0.sql
index e646cda3b..fcbc78757 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_with_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a metric in the metric-level where filter.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_metric_in_where_filter__plan0_optimized.sql
index a559e3e7c..5cb94bbb5 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_with_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a metric in the metric-level where filter.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_cumulative_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_cumulative_metric_in_where_filter__plan0.sql
index 715fe5ce7..d6e6b3b53 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_cumulative_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_cumulative_metric_in_where_filter__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests a query with a cumulative metric in the query-level where filter.
 
       Note this cumulative metric has no window / grain to date.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
index 9771a0022..4fe187895 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests a query with a cumulative metric in the query-level where filter.
 
       Note this cumulative metric has no window / grain to date.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_derived_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_derived_metric_in_where_filter__plan0.sql
index 18171fb71..54c9a9670 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_derived_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_derived_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_derived_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a derived metric in the query-level where filter.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
index d3989b130..f5815e861 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_derived_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a derived metric in the query-level where filter.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_multiple_metrics_in_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_multiple_metrics_in_filter__plan0.sql
index be4fdf15f..56b68827b 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_multiple_metrics_in_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_multiple_metrics_in_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_multiple_metrics_in_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with 2 simple metrics in the query-level where filter.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
index 605eeabf0..4917aea69 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_multiple_metrics_in_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with 2 simple metrics in the query-level where filter.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_ratio_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_ratio_metric_in_where_filter__plan0.sql
index b1ce3e38e..d105813a2 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_ratio_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_ratio_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_ratio_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a ratio metric in the query-level where filter.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
index d42815e40..f4d381151 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_ratio_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a ratio metric in the query-level where filter.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_simple_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_simple_metric_in_where_filter__plan0.sql
index 71a940254..5ab72da9b 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_simple_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_simple_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_simple_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
index 7a35ec514..1315f9edf 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/BigQuery/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_simple_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_distinct_values_query_with_metric_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_distinct_values_query_with_metric_filter__plan0.sql
index 152beb833..4a67c310c 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_distinct_values_query_with_metric_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_distinct_values_query_with_metric_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values_query_with_metric_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a distinct values query with a metric in the query-level where filter.
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['listing',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_distinct_values_query_with_metric_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
index 5fb0a0325..af1b03385 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values_query_with_metric_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a distinct values query with a metric in the query-level where filter.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
index 24485d226..2264590ca 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_by_metric_in_same_semantic_model_as_queried_metric
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
index c58aa1a13..66dbc3dce 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_by_metric_in_same_semantic_model_as_queried_metric
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_with_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_with_conversion_metric__plan0.sql
index f76a205a4..93c3fc285 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_with_conversion_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_with_conversion_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_filter_with_conversion_metric
 test_filename: test_metric_filter_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_with_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_with_conversion_metric__plan0_optimized.sql
index 4171f3b1f..b022e93fa 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_with_conversion_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_filter_with_conversion_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_filter_with_conversion_metric
 test_filename: test_metric_filter_rendering.py
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix__plan0.sql
index 628e1cf32..080ee9bc3 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_group_by_has_local_entity_prefix
 test_filename: test_metric_filter_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix__plan0_optimized.sql
index 0e8de0b2c..6ae5114cd 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_group_by_has_local_entity_prefix__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_group_by_has_local_entity_prefix
 test_filename: test_metric_filter_rendering.py
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_multi_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_multi_hop__plan0.sql
index f00ca84a5..41cf45366 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_multi_hop__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_multi_hop__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_multi_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a two-hop join in the inner query.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_multi_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_multi_hop__plan0_optimized.sql
index db440e96e..ae0625a96 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_multi_hop__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_multi_hop__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_multi_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a two-hop join in the inner query.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['third_hop_count',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_single_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_single_hop__plan0.sql
index 7003aab5a..633525bb1 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_single_hop__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_single_hop__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_single_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a one-hop join in the inner query.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_single_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_single_hop__plan0_optimized.sql
index b770931cd..32d0d4fd4 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_single_hop__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_inner_query_single_hop__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_single_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a one-hop join in the inner query.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['third_hop_count',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_filtered_by_itself__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_filtered_by_itself__plan0.sql
index ac55db6ea..611a7aa68 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_filtered_by_itself__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_filtered_by_itself__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_filtered_by_itself
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query for a metric that filters by the same metric.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_filtered_by_itself__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_filtered_by_itself__plan0_optimized.sql
index 3eca4e552..8dd5d7b83 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_filtered_by_itself__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_filtered_by_itself__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_filtered_by_itself
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query for a metric that filters by the same metric.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_with_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_with_metric_in_where_filter__plan0.sql
index c06cf99fd..7b6419e5a 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_with_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_with_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_with_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a metric in the metric-level where filter.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_with_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_with_metric_in_where_filter__plan0_optimized.sql
index 65b1f2a92..27e287e27 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_with_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_metric_with_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_with_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a metric in the metric-level where filter.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_cumulative_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_cumulative_metric_in_where_filter__plan0.sql
index 7bf214385..9bddc50bd 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_cumulative_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_cumulative_metric_in_where_filter__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests a query with a cumulative metric in the query-level where filter.
 
       Note this cumulative metric has no window / grain to date.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
index a124d15bc..e792136fa 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests a query with a cumulative metric in the query-level where filter.
 
       Note this cumulative metric has no window / grain to date.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_derived_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_derived_metric_in_where_filter__plan0.sql
index 86b4397f8..8d294954e 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_derived_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_derived_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_derived_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a derived metric in the query-level where filter.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
index 0cc3906e8..924ebfbad 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_derived_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a derived metric in the query-level where filter.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_multiple_metrics_in_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_multiple_metrics_in_filter__plan0.sql
index bb784445c..41b9cfd46 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_multiple_metrics_in_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_multiple_metrics_in_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_multiple_metrics_in_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with 2 simple metrics in the query-level where filter.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
index 7e2d36fc5..355684fa4 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_multiple_metrics_in_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with 2 simple metrics in the query-level where filter.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_ratio_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_ratio_metric_in_where_filter__plan0.sql
index a4bff6666..aebfd5d1a 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_ratio_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_ratio_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_ratio_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a ratio metric in the query-level where filter.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
index e026c15bd..7007d806d 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_ratio_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a ratio metric in the query-level where filter.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_simple_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_simple_metric_in_where_filter__plan0.sql
index ffe38d931..8a5e74db2 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_simple_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_simple_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_simple_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
index 7a35ec514..2db347fc9 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Databricks/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_simple_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0.sql
index e4ca567c1..4dc4d730e 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values_query_with_metric_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a distinct values query with a metric in the query-level where filter.
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['listing',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
index 5fb0a0325..48d70e9ee 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values_query_with_metric_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a distinct values query with a metric in the query-level where filter.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
index 25215763d..a66792b0d 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_by_metric_in_same_semantic_model_as_queried_metric
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
index c58aa1a13..4c4a00d3b 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_by_metric_in_same_semantic_model_as_queried_metric
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_conversion_metric__plan0.sql
index 09190fd5a..74e84b9de 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_conversion_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_conversion_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_filter_with_conversion_metric
 test_filename: test_metric_filter_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_conversion_metric__plan0_optimized.sql
index 3b98e0d83..71eb89003 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_conversion_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_conversion_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_filter_with_conversion_metric
 test_filename: test_metric_filter_rendering.py
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_group_by_has_local_entity_prefix__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_group_by_has_local_entity_prefix__plan0.sql
index 80f1995d3..1b529325d 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_group_by_has_local_entity_prefix__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_group_by_has_local_entity_prefix__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_group_by_has_local_entity_prefix
 test_filename: test_metric_filter_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_group_by_has_local_entity_prefix__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_group_by_has_local_entity_prefix__plan0_optimized.sql
index 0e8de0b2c..53ce7c915 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_group_by_has_local_entity_prefix__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_group_by_has_local_entity_prefix__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_group_by_has_local_entity_prefix
 test_filename: test_metric_filter_rendering.py
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_multi_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_multi_hop__plan0.sql
index e0dfeecb5..4ce34a017 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_multi_hop__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_multi_hop__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_multi_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a two-hop join in the inner query.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_multi_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_multi_hop__plan0_optimized.sql
index db440e96e..df66df82d 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_multi_hop__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_multi_hop__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_multi_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a two-hop join in the inner query.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['third_hop_count',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_single_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_single_hop__plan0.sql
index 55c5eea31..3a87a7de4 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_single_hop__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_single_hop__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_single_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a one-hop join in the inner query.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_single_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_single_hop__plan0_optimized.sql
index b770931cd..a0ea887e5 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_single_hop__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_inner_query_single_hop__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_single_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a one-hop join in the inner query.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['third_hop_count',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_filtered_by_itself__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_filtered_by_itself__plan0.sql
index a12b4f9a7..ac7e82f12 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_filtered_by_itself__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_filtered_by_itself__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_filtered_by_itself
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query for a metric that filters by the same metric.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_filtered_by_itself__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_filtered_by_itself__plan0_optimized.sql
index 3eca4e552..b0ce0b1a1 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_filtered_by_itself__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_filtered_by_itself__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_filtered_by_itself
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query for a metric that filters by the same metric.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0.sql
index 3f6343da6..635997908 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_with_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a metric in the metric-level where filter.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0_optimized.sql
index 65b1f2a92..6493e6cbc 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_with_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a metric in the metric-level where filter.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0.sql
index 2a9575857..3b0de88fd 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests a query with a cumulative metric in the query-level where filter.
 
       Note this cumulative metric has no window / grain to date.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
index a124d15bc..ffeb920a9 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests a query with a cumulative metric in the query-level where filter.
 
       Note this cumulative metric has no window / grain to date.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0.sql
index 7ebb0c433..338dd2e14 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_derived_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a derived metric in the query-level where filter.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
index 0cc3906e8..8f88a88e4 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_derived_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a derived metric in the query-level where filter.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0.sql
index f2ae1c770..fb6e97634 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_multiple_metrics_in_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with 2 simple metrics in the query-level where filter.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
index 7e2d36fc5..7c9a745ff 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_multiple_metrics_in_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with 2 simple metrics in the query-level where filter.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0.sql
index ad67caad1..d982b173a 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_ratio_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a ratio metric in the query-level where filter.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
index e026c15bd..5bf661c2a 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_ratio_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a ratio metric in the query-level where filter.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0.sql
index ff2255d7c..bc212b66c 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_simple_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
index 7a35ec514..c514aae8c 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_simple_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_distinct_values_query_with_metric_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_distinct_values_query_with_metric_filter__plan0.sql
index e4ca567c1..386c4b876 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_distinct_values_query_with_metric_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_distinct_values_query_with_metric_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values_query_with_metric_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a distinct values query with a metric in the query-level where filter.
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['listing',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_distinct_values_query_with_metric_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
index 5fb0a0325..99712c574 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values_query_with_metric_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a distinct values query with a metric in the query-level where filter.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
index 25215763d..58d7f5716 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_by_metric_in_same_semantic_model_as_queried_metric
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
index c58aa1a13..f97c47970 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_by_metric_in_same_semantic_model_as_queried_metric
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_with_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_with_conversion_metric__plan0.sql
index 1020d052a..56520a8a6 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_with_conversion_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_with_conversion_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_filter_with_conversion_metric
 test_filename: test_metric_filter_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_with_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_with_conversion_metric__plan0_optimized.sql
index 51cf26726..f6ef6f9ef 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_with_conversion_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_filter_with_conversion_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_filter_with_conversion_metric
 test_filename: test_metric_filter_rendering.py
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix__plan0.sql
index 80f1995d3..799df0e0d 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_group_by_has_local_entity_prefix
 test_filename: test_metric_filter_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix__plan0_optimized.sql
index 0e8de0b2c..557149d12 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_group_by_has_local_entity_prefix__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_group_by_has_local_entity_prefix
 test_filename: test_metric_filter_rendering.py
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_multi_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_multi_hop__plan0.sql
index e0dfeecb5..8adc92fe8 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_multi_hop__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_multi_hop__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_multi_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a two-hop join in the inner query.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_multi_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_multi_hop__plan0_optimized.sql
index db440e96e..5ab04bcc9 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_multi_hop__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_multi_hop__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_multi_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a two-hop join in the inner query.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['third_hop_count',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_single_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_single_hop__plan0.sql
index 55c5eea31..8484651c5 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_single_hop__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_single_hop__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_single_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a one-hop join in the inner query.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_single_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_single_hop__plan0_optimized.sql
index b770931cd..8fb6eae17 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_single_hop__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_inner_query_single_hop__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_single_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a one-hop join in the inner query.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['third_hop_count',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_filtered_by_itself__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_filtered_by_itself__plan0.sql
index a12b4f9a7..88d37be9f 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_filtered_by_itself__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_filtered_by_itself__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_filtered_by_itself
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query for a metric that filters by the same metric.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_filtered_by_itself__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_filtered_by_itself__plan0_optimized.sql
index 3eca4e552..7e92b1649 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_filtered_by_itself__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_filtered_by_itself__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_filtered_by_itself
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query for a metric that filters by the same metric.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_with_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_with_metric_in_where_filter__plan0.sql
index 3f6343da6..7ba0ac030 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_with_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_with_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_with_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a metric in the metric-level where filter.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_with_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_with_metric_in_where_filter__plan0_optimized.sql
index 65b1f2a92..74bc392a5 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_with_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_metric_with_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_with_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a metric in the metric-level where filter.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_cumulative_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_cumulative_metric_in_where_filter__plan0.sql
index 2a9575857..d88b47ae0 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_cumulative_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_cumulative_metric_in_where_filter__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests a query with a cumulative metric in the query-level where filter.
 
       Note this cumulative metric has no window / grain to date.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
index a124d15bc..9b3ce5aaa 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests a query with a cumulative metric in the query-level where filter.
 
       Note this cumulative metric has no window / grain to date.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_derived_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_derived_metric_in_where_filter__plan0.sql
index 7ebb0c433..ac198d4d3 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_derived_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_derived_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_derived_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a derived metric in the query-level where filter.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
index 0cc3906e8..b0a0b216f 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_derived_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a derived metric in the query-level where filter.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_multiple_metrics_in_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_multiple_metrics_in_filter__plan0.sql
index f2ae1c770..7590bc3f2 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_multiple_metrics_in_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_multiple_metrics_in_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_multiple_metrics_in_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with 2 simple metrics in the query-level where filter.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
index 7e2d36fc5..cdb2978e0 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_multiple_metrics_in_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with 2 simple metrics in the query-level where filter.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_ratio_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_ratio_metric_in_where_filter__plan0.sql
index 6b8490d30..36303be64 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_ratio_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_ratio_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_ratio_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a ratio metric in the query-level where filter.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
index 792f24c60..038d123f1 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_ratio_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a ratio metric in the query-level where filter.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_simple_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_simple_metric_in_where_filter__plan0.sql
index ff2255d7c..78a8b8f44 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_simple_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_simple_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_simple_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
index 7a35ec514..38f0a21af 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Postgres/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_simple_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_distinct_values_query_with_metric_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_distinct_values_query_with_metric_filter__plan0.sql
index 4bdf44fbf..e3c9902e5 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_distinct_values_query_with_metric_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_distinct_values_query_with_metric_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values_query_with_metric_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a distinct values query with a metric in the query-level where filter.
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['listing',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_distinct_values_query_with_metric_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
index 5fb0a0325..63728fea6 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values_query_with_metric_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a distinct values query with a metric in the query-level where filter.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
index 2a8e7a810..e4596eac3 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_by_metric_in_same_semantic_model_as_queried_metric
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
index c58aa1a13..25bcd2eb7 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_by_metric_in_same_semantic_model_as_queried_metric
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_with_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_with_conversion_metric__plan0.sql
index 4d42a11ec..295c4a178 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_with_conversion_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_with_conversion_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_filter_with_conversion_metric
 test_filename: test_metric_filter_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_with_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_with_conversion_metric__plan0_optimized.sql
index a9d47ec14..1c4dc8b06 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_with_conversion_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_filter_with_conversion_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_filter_with_conversion_metric
 test_filename: test_metric_filter_rendering.py
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix__plan0.sql
index f4788cfa8..9f1cd7cb1 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_group_by_has_local_entity_prefix
 test_filename: test_metric_filter_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix__plan0_optimized.sql
index 0e8de0b2c..f4f1f7429 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_group_by_has_local_entity_prefix__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_group_by_has_local_entity_prefix
 test_filename: test_metric_filter_rendering.py
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_multi_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_multi_hop__plan0.sql
index 0b97709bc..9ab6f8024 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_multi_hop__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_multi_hop__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_multi_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a two-hop join in the inner query.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_multi_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_multi_hop__plan0_optimized.sql
index db440e96e..c89509a59 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_multi_hop__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_multi_hop__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_multi_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a two-hop join in the inner query.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['third_hop_count',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_single_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_single_hop__plan0.sql
index 6328abd79..2d7580c20 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_single_hop__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_single_hop__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_single_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a one-hop join in the inner query.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_single_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_single_hop__plan0_optimized.sql
index b770931cd..f0195e62a 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_single_hop__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_inner_query_single_hop__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_single_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a one-hop join in the inner query.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['third_hop_count',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_filtered_by_itself__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_filtered_by_itself__plan0.sql
index 234e08fae..afa21d908 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_filtered_by_itself__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_filtered_by_itself__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_filtered_by_itself
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query for a metric that filters by the same metric.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_filtered_by_itself__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_filtered_by_itself__plan0_optimized.sql
index 3eca4e552..3c0a42954 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_filtered_by_itself__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_filtered_by_itself__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_filtered_by_itself
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query for a metric that filters by the same metric.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_with_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_with_metric_in_where_filter__plan0.sql
index 27976d468..c5ecaf14b 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_with_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_with_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_with_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a metric in the metric-level where filter.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_with_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_with_metric_in_where_filter__plan0_optimized.sql
index 65b1f2a92..40a62e346 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_with_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_metric_with_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_with_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a metric in the metric-level where filter.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_cumulative_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_cumulative_metric_in_where_filter__plan0.sql
index 68767f88e..37995e012 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_cumulative_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_cumulative_metric_in_where_filter__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests a query with a cumulative metric in the query-level where filter.
 
       Note this cumulative metric has no window / grain to date.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
index a124d15bc..ed899a05b 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests a query with a cumulative metric in the query-level where filter.
 
       Note this cumulative metric has no window / grain to date.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_derived_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_derived_metric_in_where_filter__plan0.sql
index 8665999a6..e58260b55 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_derived_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_derived_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_derived_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a derived metric in the query-level where filter.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
index 0cc3906e8..fe3105003 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_derived_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a derived metric in the query-level where filter.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_multiple_metrics_in_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_multiple_metrics_in_filter__plan0.sql
index 885e1c6e5..0451a30a0 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_multiple_metrics_in_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_multiple_metrics_in_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_multiple_metrics_in_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with 2 simple metrics in the query-level where filter.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
index 7e2d36fc5..fe7d7cbb3 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_multiple_metrics_in_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with 2 simple metrics in the query-level where filter.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_ratio_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_ratio_metric_in_where_filter__plan0.sql
index c79bda80a..b5e708fe2 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_ratio_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_ratio_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_ratio_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a ratio metric in the query-level where filter.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
index 792f24c60..5b859eca2 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_ratio_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a ratio metric in the query-level where filter.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_simple_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_simple_metric_in_where_filter__plan0.sql
index 0cc20ad9a..8c5fccf93 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_simple_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_simple_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_simple_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
index 7a35ec514..a7832d3cb 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Redshift/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_simple_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values_query_with_metric_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values_query_with_metric_filter__plan0.sql
index e52835310..2d6dafdad 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values_query_with_metric_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values_query_with_metric_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values_query_with_metric_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a distinct values query with a metric in the query-level where filter.
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['listing',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values_query_with_metric_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
index 5fb0a0325..fab9e5c31 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values_query_with_metric_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a distinct values query with a metric in the query-level where filter.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
index a61610e96..e7ca73f3e 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_by_metric_in_same_semantic_model_as_queried_metric
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
index c58aa1a13..4cf166658 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_by_metric_in_same_semantic_model_as_queried_metric
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_conversion_metric__plan0.sql
index 60230506a..81183c505 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_conversion_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_conversion_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_filter_with_conversion_metric
 test_filename: test_metric_filter_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_conversion_metric__plan0_optimized.sql
index 4e88280d3..149f48bbb 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_conversion_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_conversion_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_filter_with_conversion_metric
 test_filename: test_metric_filter_rendering.py
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix__plan0.sql
index 1b3f5b177..fdf2c09aa 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_group_by_has_local_entity_prefix
 test_filename: test_metric_filter_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix__plan0_optimized.sql
index 0e8de0b2c..7f9be66b9 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_group_by_has_local_entity_prefix__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_group_by_has_local_entity_prefix
 test_filename: test_metric_filter_rendering.py
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_multi_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_multi_hop__plan0.sql
index 03adce7aa..cdb0ce295 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_multi_hop__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_multi_hop__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_multi_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a two-hop join in the inner query.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_multi_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_multi_hop__plan0_optimized.sql
index db440e96e..b2b219ffc 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_multi_hop__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_multi_hop__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_multi_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a two-hop join in the inner query.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['third_hop_count',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_single_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_single_hop__plan0.sql
index b787ceba7..7e3be4a3b 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_single_hop__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_single_hop__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_single_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a one-hop join in the inner query.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_single_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_single_hop__plan0_optimized.sql
index b770931cd..b79ca66b2 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_single_hop__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_inner_query_single_hop__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_single_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a one-hop join in the inner query.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['third_hop_count',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_filtered_by_itself__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_filtered_by_itself__plan0.sql
index 1f235f366..d4bf5c395 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_filtered_by_itself__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_filtered_by_itself__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_filtered_by_itself
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query for a metric that filters by the same metric.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_filtered_by_itself__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_filtered_by_itself__plan0_optimized.sql
index 3eca4e552..1d6bf9b6c 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_filtered_by_itself__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_filtered_by_itself__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_filtered_by_itself
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query for a metric that filters by the same metric.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_metric_in_where_filter__plan0.sql
index 234484e39..c02037108 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_with_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a metric in the metric-level where filter.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_metric_in_where_filter__plan0_optimized.sql
index 65b1f2a92..0d5d30e3f 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_with_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a metric in the metric-level where filter.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_cumulative_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_cumulative_metric_in_where_filter__plan0.sql
index fa7ef7fd7..6e27dc8d8 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_cumulative_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_cumulative_metric_in_where_filter__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests a query with a cumulative metric in the query-level where filter.
 
       Note this cumulative metric has no window / grain to date.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
index a124d15bc..fab73b5c9 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests a query with a cumulative metric in the query-level where filter.
 
       Note this cumulative metric has no window / grain to date.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_derived_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_derived_metric_in_where_filter__plan0.sql
index 6a16c15f6..3af7d7ca7 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_derived_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_derived_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_derived_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a derived metric in the query-level where filter.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
index 0cc3906e8..a372ba649 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_derived_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a derived metric in the query-level where filter.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_multiple_metrics_in_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_multiple_metrics_in_filter__plan0.sql
index 857ae5f6a..cb686cffe 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_multiple_metrics_in_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_multiple_metrics_in_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_multiple_metrics_in_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with 2 simple metrics in the query-level where filter.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
index 7e2d36fc5..813fadcf9 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_multiple_metrics_in_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with 2 simple metrics in the query-level where filter.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_ratio_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_ratio_metric_in_where_filter__plan0.sql
index 92b03822e..f8b1eeb05 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_ratio_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_ratio_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_ratio_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a ratio metric in the query-level where filter.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
index e026c15bd..e8b9b0ede 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_ratio_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a ratio metric in the query-level where filter.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_simple_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_simple_metric_in_where_filter__plan0.sql
index 672c18825..34568910f 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_simple_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_simple_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_simple_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
index 7a35ec514..d2803d2c3 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Snowflake/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_simple_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_distinct_values_query_with_metric_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_distinct_values_query_with_metric_filter__plan0.sql
index f346caeeb..4b89dd615 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_distinct_values_query_with_metric_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_distinct_values_query_with_metric_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values_query_with_metric_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a distinct values query with a metric in the query-level where filter.
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['listing',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_distinct_values_query_with_metric_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
index 5fb0a0325..6c4b113c3 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values_query_with_metric_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a distinct values query with a metric in the query-level where filter.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
index b91eb0b0e..37e23a4c8 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_by_metric_in_same_semantic_model_as_queried_metric
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
index c58aa1a13..f1d00ba85 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_by_metric_in_same_semantic_model_as_queried_metric
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_with_conversion_metric__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_with_conversion_metric__plan0.sql
index 082ba6666..202caf1a8 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_with_conversion_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_with_conversion_metric__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_filter_with_conversion_metric
 test_filename: test_metric_filter_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_with_conversion_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_with_conversion_metric__plan0_optimized.sql
index 1825d7ca7..a2f8c8563 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_with_conversion_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_filter_with_conversion_metric__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_filter_with_conversion_metric
 test_filename: test_metric_filter_rendering.py
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix__plan0.sql
index 64d6e2968..5daf62c1b 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_group_by_has_local_entity_prefix
 test_filename: test_metric_filter_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix__plan0_optimized.sql
index 0e8de0b2c..380085c35 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_group_by_has_local_entity_prefix__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_group_by_has_local_entity_prefix
 test_filename: test_metric_filter_rendering.py
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_multi_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_multi_hop__plan0.sql
index 37bdfaeb7..de20a5a7f 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_multi_hop__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_multi_hop__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_multi_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a two-hop join in the inner query.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_multi_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_multi_hop__plan0_optimized.sql
index db440e96e..e44112b9f 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_multi_hop__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_multi_hop__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_multi_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a two-hop join in the inner query.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['third_hop_count',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_single_hop__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_single_hop__plan0.sql
index bcaf2cf5c..54dc1d796 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_single_hop__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_single_hop__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_single_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a one-hop join in the inner query.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_single_hop__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_single_hop__plan0_optimized.sql
index b770931cd..6b05cc265 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_single_hop__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_inner_query_single_hop__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_inner_query_single_hop
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests rendering for a metric filter using a one-hop join in the inner query.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['third_hop_count',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_filtered_by_itself__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_filtered_by_itself__plan0.sql
index 71abe3ca0..f4726d9f8 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_filtered_by_itself__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_filtered_by_itself__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_filtered_by_itself
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query for a metric that filters by the same metric.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_filtered_by_itself__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_filtered_by_itself__plan0_optimized.sql
index 3eca4e552..2a95d127c 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_filtered_by_itself__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_filtered_by_itself__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_filtered_by_itself
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query for a metric that filters by the same metric.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_with_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_with_metric_in_where_filter__plan0.sql
index c4be2983b..e9087a354 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_with_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_with_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_with_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a metric in the metric-level where filter.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_with_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_with_metric_in_where_filter__plan0_optimized.sql
index 65b1f2a92..9863eed9d 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_with_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_metric_with_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_with_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a metric in the metric-level where filter.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_cumulative_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_cumulative_metric_in_where_filter__plan0.sql
index 42a7c6efb..0a78be3ac 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_cumulative_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_cumulative_metric_in_where_filter__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests a query with a cumulative metric in the query-level where filter.
 
       Note this cumulative metric has no window / grain to date.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
index a124d15bc..530cc6437 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests a query with a cumulative metric in the query-level where filter.
 
       Note this cumulative metric has no window / grain to date.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_derived_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_derived_metric_in_where_filter__plan0.sql
index 4a332cd37..5819c5135 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_derived_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_derived_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_derived_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a derived metric in the query-level where filter.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
index 0cc3906e8..fedb76229 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_derived_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a derived metric in the query-level where filter.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_multiple_metrics_in_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_multiple_metrics_in_filter__plan0.sql
index cde6923a3..9a5aec631 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_multiple_metrics_in_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_multiple_metrics_in_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_multiple_metrics_in_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with 2 simple metrics in the query-level where filter.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
index 7e2d36fc5..0d390ad77 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_multiple_metrics_in_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with 2 simple metrics in the query-level where filter.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_ratio_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_ratio_metric_in_where_filter__plan0.sql
index b13ddfaa5..86d5b30da 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_ratio_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_ratio_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_ratio_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a ratio metric in the query-level where filter.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
index e026c15bd..de93123c5 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_ratio_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_ratio_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a ratio metric in the query-level where filter.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_simple_metric_in_where_filter__plan0.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_simple_metric_in_where_filter__plan0.sql
index f4fe6e2d7..77bfabfdd 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_simple_metric_in_where_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_simple_metric_in_where_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_simple_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
index 7a35ec514..8752d079c 100644
--- a/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_filter_rendering.py/SqlQueryPlan/Trino/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_query_with_simple_metric_in_where_filter
 test_filename: test_metric_filter_rendering.py
 docstring:
   Tests a query with a simple metric in the query-level where filter.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings',]
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index 73497599b..f4290694d 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_non_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using a non-primary time dimension to SQL.
+sql_engine: BigQuery
 ---
 -- Metric Time Dimension 'paid_at'
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 31f23d332..33ce06484 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_non_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using a non-primary time dimension to SQL.
+sql_engine: BigQuery
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Metric Time Dimension 'paid_at'
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 421bc276d..459acaf7f 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using the primary time dimension to SQL.
+sql_engine: BigQuery
 ---
 -- Metric Time Dimension 'ds'
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index af52555b0..695dc4708 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using the primary time dimension to SQL.
+sql_engine: BigQuery
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
index e36a697fa..a59d8456f 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_query_with_metric_time_dimension
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests building a query that uses measures defined from 2 different time dimensions.
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
index f5130a4f6..36bc8f576 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_query_with_metric_time_dimension
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests building a query that uses measures defined from 2 different time dimensions.
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index 1dc806ae1..ccfd122b0 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_non_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using a non-primary time dimension to SQL.
+sql_engine: Databricks
 ---
 -- Metric Time Dimension 'paid_at'
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index e241a3087..703a5ffab 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_non_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using a non-primary time dimension to SQL.
+sql_engine: Databricks
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Metric Time Dimension 'paid_at'
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index d03f569f7..38c9b8167 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using the primary time dimension to SQL.
+sql_engine: Databricks
 ---
 -- Metric Time Dimension 'ds'
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index fd7a57820..5e11d8e83 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using the primary time dimension to SQL.
+sql_engine: Databricks
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql
index d5c009a9c..9c545e9ab 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_query_with_metric_time_dimension
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests building a query that uses measures defined from 2 different time dimensions.
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
index a0d215a3e..c9e02e625 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_query_with_metric_time_dimension
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests building a query that uses measures defined from 2 different time dimensions.
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index 68ea038a0..32e6bd884 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_non_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using a non-primary time dimension to SQL.
+sql_engine: DuckDB
 ---
 -- Metric Time Dimension 'paid_at'
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 28e180572..b585f4f68 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_non_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using a non-primary time dimension to SQL.
+sql_engine: DuckDB
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Metric Time Dimension 'paid_at'
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 96b9cd03a..c4d84d77e 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using the primary time dimension to SQL.
+sql_engine: DuckDB
 ---
 -- Metric Time Dimension 'ds'
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 36f7a606e..05b696467 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using the primary time dimension to SQL.
+sql_engine: DuckDB
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
index 1ff3e95f6..b3f219c86 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_query_with_metric_time_dimension
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests building a query that uses measures defined from 2 different time dimensions.
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
index a0d215a3e..c82fb2412 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_query_with_metric_time_dimension
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests building a query that uses measures defined from 2 different time dimensions.
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index 68ea038a0..cf3503703 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_non_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using a non-primary time dimension to SQL.
+sql_engine: Postgres
 ---
 -- Metric Time Dimension 'paid_at'
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 28e180572..84d700616 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_non_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using a non-primary time dimension to SQL.
+sql_engine: Postgres
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Metric Time Dimension 'paid_at'
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 96b9cd03a..9eb5569a9 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using the primary time dimension to SQL.
+sql_engine: Postgres
 ---
 -- Metric Time Dimension 'ds'
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 36f7a606e..053465302 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using the primary time dimension to SQL.
+sql_engine: Postgres
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql
index 1ff3e95f6..e30a07a5c 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_query_with_metric_time_dimension
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests building a query that uses measures defined from 2 different time dimensions.
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
index a0d215a3e..02a4e5b92 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_query_with_metric_time_dimension
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests building a query that uses measures defined from 2 different time dimensions.
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index 263a6ef54..ada14027c 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_non_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using a non-primary time dimension to SQL.
+sql_engine: Redshift
 ---
 -- Metric Time Dimension 'paid_at'
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 1f07c5748..812bf2be0 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_non_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using a non-primary time dimension to SQL.
+sql_engine: Redshift
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Metric Time Dimension 'paid_at'
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 7e62c893a..52b3512f8 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using the primary time dimension to SQL.
+sql_engine: Redshift
 ---
 -- Metric Time Dimension 'ds'
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 715a787c7..071491244 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using the primary time dimension to SQL.
+sql_engine: Redshift
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql
index d14220056..491652574 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_query_with_metric_time_dimension
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests building a query that uses measures defined from 2 different time dimensions.
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
index a0d215a3e..8736f91df 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_query_with_metric_time_dimension
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests building a query that uses measures defined from 2 different time dimensions.
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index 588f6c787..79495b886 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_non_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using a non-primary time dimension to SQL.
+sql_engine: Snowflake
 ---
 -- Metric Time Dimension 'paid_at'
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 67adbd6a3..d55b0a2cf 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_non_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using a non-primary time dimension to SQL.
+sql_engine: Snowflake
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Metric Time Dimension 'paid_at'
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 0dca84e4c..659ac6219 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using the primary time dimension to SQL.
+sql_engine: Snowflake
 ---
 -- Metric Time Dimension 'ds'
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index edce5e2be..145086a1c 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using the primary time dimension to SQL.
+sql_engine: Snowflake
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql
index a8ce693bd..b4e7393e9 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_query_with_metric_time_dimension
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests building a query that uses measures defined from 2 different time dimensions.
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
index a0d215a3e..259fad37d 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_query_with_metric_time_dimension
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests building a query that uses measures defined from 2 different time dimensions.
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index 3df2f1a2c..7e32a5d1a 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_non_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using a non-primary time dimension to SQL.
+sql_engine: Trino
 ---
 -- Metric Time Dimension 'paid_at'
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 90cc62889..1f61b5ada 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_non_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using a non-primary time dimension to SQL.
+sql_engine: Trino
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Metric Time Dimension 'paid_at'
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 2287f8716..699c0be0e 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using the primary time dimension to SQL.
+sql_engine: Trino
 ---
 -- Metric Time Dimension 'ds'
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index f7c953e1f..00181ca1f 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_dimension_transform_node_using_primary_time
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests converting a PlotTimeDimensionTransform node using the primary time dimension to SQL.
+sql_engine: Trino
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_simple_query_with_metric_time_dimension__plan0.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_simple_query_with_metric_time_dimension__plan0.sql
index 37aafe7b5..d43bcce74 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_query_with_metric_time_dimension
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests building a query that uses measures defined from 2 different time dimensions.
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_simple_query_with_metric_time_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
index a0d215a3e..663ee1971 100644
--- a/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Trino/test_simple_query_with_metric_time_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_query_with_metric_time_dimension
 test_filename: test_metric_time_dimension_to_sql.py
 docstring:
   Tests building a query that uses measures defined from 2 different time dimensions.
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_dimensions_with_time_constraint__plan0.sql
index 1096d0433..93cd09692 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_dimensions_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_dimensions_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_dimensions_with_time_constraint
 test_filename: test_metric_time_without_metrics.py
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_dimensions_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_dimensions_with_time_constraint__plan0_optimized.sql
index 2500289c9..6d88dc1f1 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_dimensions_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_dimensions_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_dimensions_with_time_constraint
 test_filename: test_metric_time_without_metrics.py
+sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-03T00:00:00]
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_only__plan0.sql
index 73ebd626a..8ed7e53be 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_only__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_only__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_only
 test_filename: test_metric_time_without_metrics.py
 docstring:
   Tests querying only metric time.
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['metric_time__day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_only__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_only__plan0_optimized.sql
index cc03aeb1a..abb717fad 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_only__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_only__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_only
 test_filename: test_metric_time_without_metrics.py
 docstring:
   Tests querying only metric time.
+sql_engine: BigQuery
 ---
 -- Time Spine
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_quarter_alone__plan0.sql
index 6cb6b584d..35e61ef18 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_quarter_alone__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_quarter_alone__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_quarter_alone
 test_filename: test_metric_time_without_metrics.py
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['metric_time__quarter',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_quarter_alone__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_quarter_alone__plan0_optimized.sql
index a09b66151..87951f908 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_quarter_alone__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_quarter_alone__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_quarter_alone
 test_filename: test_metric_time_without_metrics.py
+sql_engine: BigQuery
 ---
 -- Time Spine
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_with_other_dimensions__plan0.sql
index db6e95510..df31c7a88 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_with_other_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_with_other_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_with_other_dimensions
 test_filename: test_metric_time_without_metrics.py
+sql_engine: BigQuery
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_with_other_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_with_other_dimensions__plan0_optimized.sql
index b753f25db..a812644fa 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_with_other_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/BigQuery/test_metric_time_with_other_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_with_other_dimensions
 test_filename: test_metric_time_without_metrics.py
+sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_dimensions_with_time_constraint__plan0.sql
index a7535a999..ab676ca62 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_dimensions_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_dimensions_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_dimensions_with_time_constraint
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_dimensions_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_dimensions_with_time_constraint__plan0_optimized.sql
index 8916c032e..2cf42ce5d 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_dimensions_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_dimensions_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_dimensions_with_time_constraint
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Databricks
 ---
 -- Join Standard Outputs
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-03T00:00:00]
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_only__plan0.sql
index 2071cfbd0..b6b1f9dae 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_only__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_only__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_only
 test_filename: test_metric_time_without_metrics.py
 docstring:
   Tests querying only metric time.
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['metric_time__day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_only__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_only__plan0_optimized.sql
index 59e07f640..81b3fd454 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_only__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_only__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_only
 test_filename: test_metric_time_without_metrics.py
 docstring:
   Tests querying only metric time.
+sql_engine: Databricks
 ---
 -- Time Spine
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_quarter_alone__plan0.sql
index 4ad0532f6..e73a36877 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_quarter_alone__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_quarter_alone__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_quarter_alone
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['metric_time__quarter',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_quarter_alone__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_quarter_alone__plan0_optimized.sql
index a723a2152..f01314591 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_quarter_alone__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_quarter_alone__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_quarter_alone
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Databricks
 ---
 -- Time Spine
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_with_other_dimensions__plan0.sql
index d63c51c14..22410f850 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_with_other_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_with_other_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_with_other_dimensions
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Databricks
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_with_other_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_with_other_dimensions__plan0_optimized.sql
index 0b1c7ebd2..9adb12669 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_with_other_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Databricks/test_metric_time_with_other_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_with_other_dimensions
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Databricks
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_dimensions_with_time_constraint__plan0.sql
index 6b6069c0e..92927d3cf 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_dimensions_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_dimensions_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_dimensions_with_time_constraint
 test_filename: test_metric_time_without_metrics.py
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_dimensions_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_dimensions_with_time_constraint__plan0_optimized.sql
index 8916c032e..ac73c82d9 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_dimensions_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_dimensions_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_dimensions_with_time_constraint
 test_filename: test_metric_time_without_metrics.py
+sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-03T00:00:00]
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_only__plan0.sql
index 2547c9c6d..0ab814c35 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_only__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_only__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_only
 test_filename: test_metric_time_without_metrics.py
 docstring:
   Tests querying only metric time.
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['metric_time__day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_only__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_only__plan0_optimized.sql
index 59e07f640..53b18709c 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_only__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_only__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_only
 test_filename: test_metric_time_without_metrics.py
 docstring:
   Tests querying only metric time.
+sql_engine: DuckDB
 ---
 -- Time Spine
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_quarter_alone__plan0.sql
index 9b9f71ae8..653defd92 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_quarter_alone__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_quarter_alone__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_quarter_alone
 test_filename: test_metric_time_without_metrics.py
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['metric_time__quarter',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_quarter_alone__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_quarter_alone__plan0_optimized.sql
index a723a2152..e9805d75d 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_quarter_alone__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_quarter_alone__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_quarter_alone
 test_filename: test_metric_time_without_metrics.py
+sql_engine: DuckDB
 ---
 -- Time Spine
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_with_other_dimensions__plan0.sql
index c54500cc6..40ba83a8d 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_with_other_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_with_other_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_with_other_dimensions
 test_filename: test_metric_time_without_metrics.py
+sql_engine: DuckDB
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_with_other_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_with_other_dimensions__plan0_optimized.sql
index 0b1c7ebd2..ec1326b19 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_with_other_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/DuckDB/test_metric_time_with_other_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_with_other_dimensions
 test_filename: test_metric_time_without_metrics.py
+sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_dimensions_with_time_constraint__plan0.sql
index 6b6069c0e..3d94e68bd 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_dimensions_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_dimensions_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_dimensions_with_time_constraint
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_dimensions_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_dimensions_with_time_constraint__plan0_optimized.sql
index 8916c032e..3ab1c2cd7 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_dimensions_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_dimensions_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_dimensions_with_time_constraint
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Postgres
 ---
 -- Join Standard Outputs
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-03T00:00:00]
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_only__plan0.sql
index 2547c9c6d..a68e97abe 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_only__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_only__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_only
 test_filename: test_metric_time_without_metrics.py
 docstring:
   Tests querying only metric time.
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['metric_time__day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_only__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_only__plan0_optimized.sql
index 59e07f640..396ea6a18 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_only__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_only__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_only
 test_filename: test_metric_time_without_metrics.py
 docstring:
   Tests querying only metric time.
+sql_engine: Postgres
 ---
 -- Time Spine
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_quarter_alone__plan0.sql
index 9b9f71ae8..aeb29f9d3 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_quarter_alone__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_quarter_alone__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_quarter_alone
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['metric_time__quarter',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_quarter_alone__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_quarter_alone__plan0_optimized.sql
index a723a2152..0b3bbb008 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_quarter_alone__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_quarter_alone__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_quarter_alone
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Postgres
 ---
 -- Time Spine
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_with_other_dimensions__plan0.sql
index c54500cc6..61e0cb681 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_with_other_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_with_other_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_with_other_dimensions
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Postgres
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_with_other_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_with_other_dimensions__plan0_optimized.sql
index 0b1c7ebd2..63d1ce8f6 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_with_other_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Postgres/test_metric_time_with_other_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_with_other_dimensions
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Postgres
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_dimensions_with_time_constraint__plan0.sql
index c3e55e3b9..1e3c98df3 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_dimensions_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_dimensions_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_dimensions_with_time_constraint
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_dimensions_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_dimensions_with_time_constraint__plan0_optimized.sql
index 8916c032e..f0c7b115c 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_dimensions_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_dimensions_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_dimensions_with_time_constraint
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Redshift
 ---
 -- Join Standard Outputs
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-03T00:00:00]
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_only__plan0.sql
index 1efbcd910..363b480b1 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_only__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_only__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_only
 test_filename: test_metric_time_without_metrics.py
 docstring:
   Tests querying only metric time.
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['metric_time__day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_only__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_only__plan0_optimized.sql
index 59e07f640..30a3f2c67 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_only__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_only__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_only
 test_filename: test_metric_time_without_metrics.py
 docstring:
   Tests querying only metric time.
+sql_engine: Redshift
 ---
 -- Time Spine
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_quarter_alone__plan0.sql
index 739f064b8..71c7a9ebe 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_quarter_alone__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_quarter_alone__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_quarter_alone
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['metric_time__quarter',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_quarter_alone__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_quarter_alone__plan0_optimized.sql
index a723a2152..7e9f5a6c1 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_quarter_alone__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_quarter_alone__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_quarter_alone
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Redshift
 ---
 -- Time Spine
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_with_other_dimensions__plan0.sql
index 6ebdca8ec..0ae9950f6 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_with_other_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_with_other_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_with_other_dimensions
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Redshift
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_with_other_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_with_other_dimensions__plan0_optimized.sql
index 0b1c7ebd2..449918ddd 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_with_other_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Redshift/test_metric_time_with_other_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_with_other_dimensions
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Redshift
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_dimensions_with_time_constraint__plan0.sql
index 0fc415010..7d2c6ab6a 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_dimensions_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_dimensions_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_dimensions_with_time_constraint
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_dimensions_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_dimensions_with_time_constraint__plan0_optimized.sql
index 8916c032e..f61217729 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_dimensions_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_dimensions_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_dimensions_with_time_constraint
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-03T00:00:00]
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_only__plan0.sql
index b5a805e44..3d11de332 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_only__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_only__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_only
 test_filename: test_metric_time_without_metrics.py
 docstring:
   Tests querying only metric time.
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['metric_time__day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_only__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_only__plan0_optimized.sql
index 59e07f640..b48c10b99 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_only__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_only__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_only
 test_filename: test_metric_time_without_metrics.py
 docstring:
   Tests querying only metric time.
+sql_engine: Snowflake
 ---
 -- Time Spine
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_quarter_alone__plan0.sql
index 2fb7568d0..1df677cfb 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_quarter_alone__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_quarter_alone__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_quarter_alone
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['metric_time__quarter',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_quarter_alone__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_quarter_alone__plan0_optimized.sql
index a723a2152..5a4200189 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_quarter_alone__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_quarter_alone__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_quarter_alone
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Snowflake
 ---
 -- Time Spine
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_with_other_dimensions__plan0.sql
index 8ca5edc03..49ae4680d 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_with_other_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_with_other_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_with_other_dimensions
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Snowflake
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_with_other_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_with_other_dimensions__plan0_optimized.sql
index 0b1c7ebd2..8cc860f7f 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_with_other_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Snowflake/test_metric_time_with_other_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_with_other_dimensions
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_dimensions_with_time_constraint__plan0.sql
index 5c90e2ff0..4d962f073 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_dimensions_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_dimensions_with_time_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_dimensions_with_time_constraint
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_dimensions_with_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_dimensions_with_time_constraint__plan0_optimized.sql
index d219055e7..63ccc44d0 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_dimensions_with_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_dimensions_with_time_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_dimensions_with_time_constraint
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Trino
 ---
 -- Join Standard Outputs
 -- Constrain Time Range to [2020-01-01T00:00:00, 2020-01-03T00:00:00]
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_only__plan0.sql
index 87f452340..17813218c 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_only__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_only__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_only
 test_filename: test_metric_time_without_metrics.py
 docstring:
   Tests querying only metric time.
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['metric_time__day',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_only__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_only__plan0_optimized.sql
index 59e07f640..7678cae29 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_only__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_only__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_metric_time_only
 test_filename: test_metric_time_without_metrics.py
 docstring:
   Tests querying only metric time.
+sql_engine: Trino
 ---
 -- Time Spine
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_quarter_alone__plan0.sql
index 2c481316e..ba0ac7818 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_quarter_alone__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_quarter_alone__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_quarter_alone
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['metric_time__quarter',]
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_quarter_alone__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_quarter_alone__plan0_optimized.sql
index a723a2152..e946371cb 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_quarter_alone__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_quarter_alone__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_quarter_alone
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Trino
 ---
 -- Time Spine
 -- Metric Time Dimension 'ds'
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_with_other_dimensions__plan0.sql
index edb47e155..ca87fba61 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_with_other_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_with_other_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_with_other_dimensions
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Trino
 ---
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
 SELECT
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_with_other_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_with_other_dimensions__plan0_optimized.sql
index 0b1c7ebd2..43d59ec97 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_with_other_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlQueryPlan/Trino/test_metric_time_with_other_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_time_with_other_dimensions
 test_filename: test_metric_time_without_metrics.py
+sql_engine: Trino
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['user__home_state_latest', 'listing__is_lux_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_query_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_query_filters__plan0.sql
index 3feb3ba99..39be65583 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_query_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_query_filters__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_query_filters
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests pushdown optimizer behavior for a simple predicate on a conversion metric.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_query_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_query_filters__plan0_optimized.sql
index 6d7d38c16..6c47271c6 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_query_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_query_filters__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_query_filters
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests pushdown optimizer behavior for a simple predicate on a conversion metric.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_query_time_filters__plan0.sql
index 4b6e6adf7..4219eb878 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_query_time_filters__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a cumulative metric.
 
       TODO: support metric time filters
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
index 88075da6d..3ab673938 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a cumulative metric.
 
       TODO: support metric time filters
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers', 'listing__country_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
index 14496008b..350ccf457 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
@@ -10,6 +10,7 @@ docstring:
 
       The metric listed here has one input that filters on bookings__is_instant and another that does not, which means
       the source input for the latter input must NOT have the filter applied to it.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
index af144aacd..71d8872b7 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
@@ -10,6 +10,7 @@ docstring:
 
       The metric listed here has one input that filters on bookings__is_instant and another that does not, which means
       the source input for the latter input must NOT have the filter applied to it.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
index e1447372f..64f3776b5 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a metric with a time spine and fill_nulls_with enabled.
 
       TODO: support metric time filters
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
index 983054249..c0df4693c 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a metric with a time spine and fill_nulls_with enabled.
 
       TODO: support metric time filters
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_metric_time_filter_with_two_targets__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_metric_time_filter_with_two_targets__plan0.sql
index 55b2ab2d8..f7b639d43 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_metric_time_filter_with_two_targets__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_metric_time_filter_with_two_targets__plan0.sql
@@ -5,6 +5,7 @@ docstring:
 
       This is currently a no-op for the pushdown optimizer.
       TODO: support metric time pushdown
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_metric_time_filter_with_two_targets__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_metric_time_filter_with_two_targets__plan0_optimized.sql
index e770e3855..85fceaee3 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_metric_time_filter_with_two_targets__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_metric_time_filter_with_two_targets__plan0_optimized.sql
@@ -5,6 +5,7 @@ docstring:
 
       This is currently a no-op for the pushdown optimizer.
       TODO: support metric time pushdown
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_categorical_dimension_pushdown__plan0.sql
index 4f8393209..6450565ce 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_categorical_dimension_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_categorical_dimension_pushdown__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multiple_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for more than one categorical dimension.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
index c76f7f142..9608fabe6 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multiple_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for more than one categorical dimension.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings', 'user__home_state_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0.sql
index 540bcd38e..ad4b73820 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a derived offset metric.
 
       TODO: support metric time filters
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0_optimized.sql
index 49be3861e..649c63350 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a derived offset metric.
 
       TODO: support metric time filters
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_saved_query_with_metric_joins_and_filter__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_saved_query_with_metric_joins_and_filter__plan0.sql
index 6ff186e14..565c1b3e9 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_saved_query_with_metric_joins_and_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_saved_query_with_metric_joins_and_filter__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
index 588689557..be3f4b446 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
index 3cee2650e..981e7f09e 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
index ca712fdf1..2659e82a7 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_single_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_single_categorical_dimension_pushdown__plan0.sql
index 2614f9e6b..24135dab3 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_single_categorical_dimension_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_single_categorical_dimension_pushdown__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_single_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for a single categorical dimension.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_single_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_single_categorical_dimension_pushdown__plan0_optimized.sql
index 62acfda0a..1773875af 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_single_categorical_dimension_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_single_categorical_dimension_pushdown__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_single_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for a single categorical dimension.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_skipped_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_skipped_pushdown__plan0.sql
index 67e0c2202..10abcaa3d 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_skipped_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_skipped_pushdown__plan0.sql
@@ -7,6 +7,7 @@ docstring:
       skip pushdown, typically due to a lack of certainty over whether or not the query will return the same results.
 
       The specific scenario is less important here than that it match one that should not be pushed down.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_skipped_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_skipped_pushdown__plan0_optimized.sql
index e0f56965f..c34207ed0 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_skipped_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/BigQuery/test_skipped_pushdown__plan0_optimized.sql
@@ -7,6 +7,7 @@ docstring:
       skip pushdown, typically due to a lack of certainty over whether or not the query will return the same results.
 
       The specific scenario is less important here than that it match one that should not be pushed down.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_query_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_query_filters__plan0.sql
index 2cc1c1ae9..cb69ccf65 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_query_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_query_filters__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_query_filters
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests pushdown optimizer behavior for a simple predicate on a conversion metric.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_query_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_query_filters__plan0_optimized.sql
index 57b0a76df..0e4dfc036 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_query_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_conversion_metric_query_filters__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_query_filters
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests pushdown optimizer behavior for a simple predicate on a conversion metric.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_query_time_filters__plan0.sql
index 94fdf3eec..e58dc8028 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_query_time_filters__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a cumulative metric.
 
       TODO: support metric time filters
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
index aa9b912d6..1e9401d68 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a cumulative metric.
 
       TODO: support metric time filters
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers', 'listing__country_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
index cbeeb5424..8fba409f2 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
@@ -10,6 +10,7 @@ docstring:
 
       The metric listed here has one input that filters on bookings__is_instant and another that does not, which means
       the source input for the latter input must NOT have the filter applied to it.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
index 7a278ac5b..92979c007 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
@@ -10,6 +10,7 @@ docstring:
 
       The metric listed here has one input that filters on bookings__is_instant and another that does not, which means
       the source input for the latter input must NOT have the filter applied to it.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
index d3596f3ae..a31c378f6 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a metric with a time spine and fill_nulls_with enabled.
 
       TODO: support metric time filters
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
index c002c5ca7..9daa5092a 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a metric with a time spine and fill_nulls_with enabled.
 
       TODO: support metric time filters
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_metric_time_filter_with_two_targets__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_metric_time_filter_with_two_targets__plan0.sql
index 0119340f1..476981d55 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_metric_time_filter_with_two_targets__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_metric_time_filter_with_two_targets__plan0.sql
@@ -5,6 +5,7 @@ docstring:
 
       This is currently a no-op for the pushdown optimizer.
       TODO: support metric time pushdown
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_metric_time_filter_with_two_targets__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_metric_time_filter_with_two_targets__plan0_optimized.sql
index fff21f640..a9c73dad6 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_metric_time_filter_with_two_targets__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_metric_time_filter_with_two_targets__plan0_optimized.sql
@@ -5,6 +5,7 @@ docstring:
 
       This is currently a no-op for the pushdown optimizer.
       TODO: support metric time pushdown
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_categorical_dimension_pushdown__plan0.sql
index fe9178950..cde7b7d4b 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_categorical_dimension_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_categorical_dimension_pushdown__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multiple_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for more than one categorical dimension.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
index c76f7f142..e17124d29 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multiple_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for more than one categorical dimension.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings', 'user__home_state_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_offset_metric_with_query_time_filters__plan0.sql
index 637232821..fc5c44e96 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_offset_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_offset_metric_with_query_time_filters__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a derived offset metric.
 
       TODO: support metric time filters
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_offset_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_offset_metric_with_query_time_filters__plan0_optimized.sql
index 3a91a82d2..3916fbc8d 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_offset_metric_with_query_time_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_offset_metric_with_query_time_filters__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a derived offset metric.
 
       TODO: support metric time filters
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_saved_query_with_metric_joins_and_filter__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_saved_query_with_metric_joins_and_filter__plan0.sql
index ab49ec942..aba73f51a 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_saved_query_with_metric_joins_and_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_saved_query_with_metric_joins_and_filter__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
index 0c1bf25a6..605bb59d1 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
index 28cbd4617..ef8ef7b7f 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
index 85d504199..7d1ca9d50 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_single_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_single_categorical_dimension_pushdown__plan0.sql
index 5544cb807..4355dd66b 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_single_categorical_dimension_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_single_categorical_dimension_pushdown__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_single_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for a single categorical dimension.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_single_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_single_categorical_dimension_pushdown__plan0_optimized.sql
index 62acfda0a..4bfbc1b43 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_single_categorical_dimension_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_single_categorical_dimension_pushdown__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_single_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for a single categorical dimension.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_skipped_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_skipped_pushdown__plan0.sql
index 10d0a8ce1..fb85cea9c 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_skipped_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_skipped_pushdown__plan0.sql
@@ -7,6 +7,7 @@ docstring:
       skip pushdown, typically due to a lack of certainty over whether or not the query will return the same results.
 
       The specific scenario is less important here than that it match one that should not be pushed down.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_skipped_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_skipped_pushdown__plan0_optimized.sql
index e0f56965f..5414b240f 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_skipped_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Databricks/test_skipped_pushdown__plan0_optimized.sql
@@ -7,6 +7,7 @@ docstring:
       skip pushdown, typically due to a lack of certainty over whether or not the query will return the same results.
 
       The specific scenario is less important here than that it match one that should not be pushed down.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_query_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_query_filters__plan0.sql
index 7040d87d2..6128ce335 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_query_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_query_filters__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_query_filters
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests pushdown optimizer behavior for a simple predicate on a conversion metric.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_query_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_query_filters__plan0_optimized.sql
index b271894e8..c3ae14da6 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_query_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_conversion_metric_query_filters__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_query_filters
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests pushdown optimizer behavior for a simple predicate on a conversion metric.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_query_time_filters__plan0.sql
index 58f05a117..02e89f7fc 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_query_time_filters__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a cumulative metric.
 
       TODO: support metric time filters
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
index befb96acc..a25c0542f 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a cumulative metric.
 
       TODO: support metric time filters
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers', 'listing__country_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
index 859484597..df38de09e 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
@@ -10,6 +10,7 @@ docstring:
 
       The metric listed here has one input that filters on bookings__is_instant and another that does not, which means
       the source input for the latter input must NOT have the filter applied to it.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
index 7a278ac5b..7c8a701bb 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
@@ -10,6 +10,7 @@ docstring:
 
       The metric listed here has one input that filters on bookings__is_instant and another that does not, which means
       the source input for the latter input must NOT have the filter applied to it.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
index 1a15d8580..64e091427 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a metric with a time spine and fill_nulls_with enabled.
 
       TODO: support metric time filters
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
index 0006c63be..353a58c7d 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a metric with a time spine and fill_nulls_with enabled.
 
       TODO: support metric time filters
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_metric_time_filter_with_two_targets__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_metric_time_filter_with_two_targets__plan0.sql
index 2174a6445..decf5586b 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_metric_time_filter_with_two_targets__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_metric_time_filter_with_two_targets__plan0.sql
@@ -5,6 +5,7 @@ docstring:
 
       This is currently a no-op for the pushdown optimizer.
       TODO: support metric time pushdown
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_metric_time_filter_with_two_targets__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_metric_time_filter_with_two_targets__plan0_optimized.sql
index fff21f640..9282f02b5 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_metric_time_filter_with_two_targets__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_metric_time_filter_with_two_targets__plan0_optimized.sql
@@ -5,6 +5,7 @@ docstring:
 
       This is currently a no-op for the pushdown optimizer.
       TODO: support metric time pushdown
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_categorical_dimension_pushdown__plan0.sql
index f35cbde71..7c840ec4a 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_categorical_dimension_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_categorical_dimension_pushdown__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multiple_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for more than one categorical dimension.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
index c76f7f142..45ba9d3c4 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multiple_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for more than one categorical dimension.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings', 'user__home_state_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0.sql
index 611eac96c..11ed54a07 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a derived offset metric.
 
       TODO: support metric time filters
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0_optimized.sql
index a40a5f700..e8368747a 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a derived offset metric.
 
       TODO: support metric time filters
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_saved_query_with_metric_joins_and_filter__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_saved_query_with_metric_joins_and_filter__plan0.sql
index bdba23f34..545235e18 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_saved_query_with_metric_joins_and_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_saved_query_with_metric_joins_and_filter__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
index 0c1bf25a6..766a90fea 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
index 92d58ea51..8602d0e4c 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
index 85d504199..c5ff38a66 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_single_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_single_categorical_dimension_pushdown__plan0.sql
index e16175f38..aeb919076 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_single_categorical_dimension_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_single_categorical_dimension_pushdown__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_single_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for a single categorical dimension.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_single_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_single_categorical_dimension_pushdown__plan0_optimized.sql
index 62acfda0a..daaca37c0 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_single_categorical_dimension_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_single_categorical_dimension_pushdown__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_single_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for a single categorical dimension.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_skipped_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_skipped_pushdown__plan0.sql
index 09d9fd001..8f6e97df8 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_skipped_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_skipped_pushdown__plan0.sql
@@ -7,6 +7,7 @@ docstring:
       skip pushdown, typically due to a lack of certainty over whether or not the query will return the same results.
 
       The specific scenario is less important here than that it match one that should not be pushed down.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_skipped_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_skipped_pushdown__plan0_optimized.sql
index e0f56965f..67bd8629e 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_skipped_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/DuckDB/test_skipped_pushdown__plan0_optimized.sql
@@ -7,6 +7,7 @@ docstring:
       skip pushdown, typically due to a lack of certainty over whether or not the query will return the same results.
 
       The specific scenario is less important here than that it match one that should not be pushed down.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_query_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_query_filters__plan0.sql
index cc1d0a3eb..aacaac7d3 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_query_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_query_filters__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_query_filters
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests pushdown optimizer behavior for a simple predicate on a conversion metric.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_query_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_query_filters__plan0_optimized.sql
index 850dd7e7a..a67f4a2f5 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_query_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_conversion_metric_query_filters__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_query_filters
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests pushdown optimizer behavior for a simple predicate on a conversion metric.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_query_time_filters__plan0.sql
index 358fb1e99..911960b33 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_query_time_filters__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a cumulative metric.
 
       TODO: support metric time filters
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
index 60f409f19..d1859b5c9 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a cumulative metric.
 
       TODO: support metric time filters
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers', 'listing__country_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
index eb55f216e..6b3bb269b 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
@@ -10,6 +10,7 @@ docstring:
 
       The metric listed here has one input that filters on bookings__is_instant and another that does not, which means
       the source input for the latter input must NOT have the filter applied to it.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
index 26f0ee33a..5fc69eaeb 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
@@ -10,6 +10,7 @@ docstring:
 
       The metric listed here has one input that filters on bookings__is_instant and another that does not, which means
       the source input for the latter input must NOT have the filter applied to it.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
index 01f87d425..b2e5f0ec2 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a metric with a time spine and fill_nulls_with enabled.
 
       TODO: support metric time filters
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
index b85b36695..15ac247a9 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a metric with a time spine and fill_nulls_with enabled.
 
       TODO: support metric time filters
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_metric_time_filter_with_two_targets__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_metric_time_filter_with_two_targets__plan0.sql
index 2174a6445..ed06a69e2 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_metric_time_filter_with_two_targets__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_metric_time_filter_with_two_targets__plan0.sql
@@ -5,6 +5,7 @@ docstring:
 
       This is currently a no-op for the pushdown optimizer.
       TODO: support metric time pushdown
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_metric_time_filter_with_two_targets__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_metric_time_filter_with_two_targets__plan0_optimized.sql
index fff21f640..7353c5dce 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_metric_time_filter_with_two_targets__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_metric_time_filter_with_two_targets__plan0_optimized.sql
@@ -5,6 +5,7 @@ docstring:
 
       This is currently a no-op for the pushdown optimizer.
       TODO: support metric time pushdown
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_categorical_dimension_pushdown__plan0.sql
index f35cbde71..ac6833e62 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_categorical_dimension_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_categorical_dimension_pushdown__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multiple_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for more than one categorical dimension.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
index c76f7f142..27d626ae7 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multiple_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for more than one categorical dimension.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings', 'user__home_state_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_offset_metric_with_query_time_filters__plan0.sql
index d5031e921..36e886bb4 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_offset_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_offset_metric_with_query_time_filters__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a derived offset metric.
 
       TODO: support metric time filters
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_offset_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_offset_metric_with_query_time_filters__plan0_optimized.sql
index 61c042b4d..637b25a3f 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_offset_metric_with_query_time_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_offset_metric_with_query_time_filters__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a derived offset metric.
 
       TODO: support metric time filters
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_saved_query_with_metric_joins_and_filter__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_saved_query_with_metric_joins_and_filter__plan0.sql
index ecbc62366..56e82accc 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_saved_query_with_metric_joins_and_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_saved_query_with_metric_joins_and_filter__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
index 45124f085..c8ab77479 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
index 92d58ea51..eba4bd627 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
index 85d504199..8b30ca56e 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_single_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_single_categorical_dimension_pushdown__plan0.sql
index e16175f38..22c2650bb 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_single_categorical_dimension_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_single_categorical_dimension_pushdown__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_single_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for a single categorical dimension.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_single_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_single_categorical_dimension_pushdown__plan0_optimized.sql
index 62acfda0a..800696e04 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_single_categorical_dimension_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_single_categorical_dimension_pushdown__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_single_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for a single categorical dimension.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_skipped_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_skipped_pushdown__plan0.sql
index 09d9fd001..576751039 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_skipped_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_skipped_pushdown__plan0.sql
@@ -7,6 +7,7 @@ docstring:
       skip pushdown, typically due to a lack of certainty over whether or not the query will return the same results.
 
       The specific scenario is less important here than that it match one that should not be pushed down.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_skipped_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_skipped_pushdown__plan0_optimized.sql
index e0f56965f..303d909b0 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_skipped_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Postgres/test_skipped_pushdown__plan0_optimized.sql
@@ -7,6 +7,7 @@ docstring:
       skip pushdown, typically due to a lack of certainty over whether or not the query will return the same results.
 
       The specific scenario is less important here than that it match one that should not be pushed down.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_query_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_query_filters__plan0.sql
index 0975b8b06..21e3d4294 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_query_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_query_filters__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_query_filters
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests pushdown optimizer behavior for a simple predicate on a conversion metric.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_query_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_query_filters__plan0_optimized.sql
index cb9bd5006..93089f74a 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_query_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_conversion_metric_query_filters__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_query_filters
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests pushdown optimizer behavior for a simple predicate on a conversion metric.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_query_time_filters__plan0.sql
index db2757daf..fa64a9769 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_query_time_filters__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a cumulative metric.
 
       TODO: support metric time filters
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
index aa9b912d6..d0b3f7903 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a cumulative metric.
 
       TODO: support metric time filters
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers', 'listing__country_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
index 3b26842c8..75ef92e1d 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
@@ -10,6 +10,7 @@ docstring:
 
       The metric listed here has one input that filters on bookings__is_instant and another that does not, which means
       the source input for the latter input must NOT have the filter applied to it.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
index 26f0ee33a..1f5468866 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
@@ -10,6 +10,7 @@ docstring:
 
       The metric listed here has one input that filters on bookings__is_instant and another that does not, which means
       the source input for the latter input must NOT have the filter applied to it.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
index b0621548d..7e3af3962 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a metric with a time spine and fill_nulls_with enabled.
 
       TODO: support metric time filters
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
index c002c5ca7..26fd818dd 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a metric with a time spine and fill_nulls_with enabled.
 
       TODO: support metric time filters
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_metric_time_filter_with_two_targets__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_metric_time_filter_with_two_targets__plan0.sql
index b246076a5..1ed12b0a4 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_metric_time_filter_with_two_targets__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_metric_time_filter_with_two_targets__plan0.sql
@@ -5,6 +5,7 @@ docstring:
 
       This is currently a no-op for the pushdown optimizer.
       TODO: support metric time pushdown
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_metric_time_filter_with_two_targets__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_metric_time_filter_with_two_targets__plan0_optimized.sql
index fff21f640..5710443ff 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_metric_time_filter_with_two_targets__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_metric_time_filter_with_two_targets__plan0_optimized.sql
@@ -5,6 +5,7 @@ docstring:
 
       This is currently a no-op for the pushdown optimizer.
       TODO: support metric time pushdown
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_categorical_dimension_pushdown__plan0.sql
index c1239682c..9dc62c429 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_categorical_dimension_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_categorical_dimension_pushdown__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multiple_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for more than one categorical dimension.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
index c76f7f142..e5ce1809d 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multiple_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for more than one categorical dimension.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings', 'user__home_state_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_offset_metric_with_query_time_filters__plan0.sql
index c31ca3a07..2eda004d9 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_offset_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_offset_metric_with_query_time_filters__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a derived offset metric.
 
       TODO: support metric time filters
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_offset_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_offset_metric_with_query_time_filters__plan0_optimized.sql
index 3a91a82d2..360555b7c 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_offset_metric_with_query_time_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_offset_metric_with_query_time_filters__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a derived offset metric.
 
       TODO: support metric time filters
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_saved_query_with_metric_joins_and_filter__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_saved_query_with_metric_joins_and_filter__plan0.sql
index 1ddfa0491..1f3fd095b 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_saved_query_with_metric_joins_and_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_saved_query_with_metric_joins_and_filter__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
index 45124f085..907567ef0 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
index ffdcb0305..ea559b11e 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
index 85d504199..0e86ce90f 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_single_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_single_categorical_dimension_pushdown__plan0.sql
index 5229d8837..1c94a79d3 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_single_categorical_dimension_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_single_categorical_dimension_pushdown__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_single_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for a single categorical dimension.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_single_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_single_categorical_dimension_pushdown__plan0_optimized.sql
index 62acfda0a..f301278ae 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_single_categorical_dimension_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_single_categorical_dimension_pushdown__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_single_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for a single categorical dimension.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_skipped_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_skipped_pushdown__plan0.sql
index a40ce20bb..f3dfc4d78 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_skipped_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_skipped_pushdown__plan0.sql
@@ -7,6 +7,7 @@ docstring:
       skip pushdown, typically due to a lack of certainty over whether or not the query will return the same results.
 
       The specific scenario is less important here than that it match one that should not be pushed down.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_skipped_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_skipped_pushdown__plan0_optimized.sql
index e0f56965f..76bab10ea 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_skipped_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Redshift/test_skipped_pushdown__plan0_optimized.sql
@@ -7,6 +7,7 @@ docstring:
       skip pushdown, typically due to a lack of certainty over whether or not the query will return the same results.
 
       The specific scenario is less important here than that it match one that should not be pushed down.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_query_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_query_filters__plan0.sql
index fbbe84646..efdba9fa9 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_query_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_query_filters__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_query_filters
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests pushdown optimizer behavior for a simple predicate on a conversion metric.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_query_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_query_filters__plan0_optimized.sql
index cb99670ef..9e9ceb15d 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_query_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_conversion_metric_query_filters__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_query_filters
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests pushdown optimizer behavior for a simple predicate on a conversion metric.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_query_time_filters__plan0.sql
index 856325ebd..3db12db1c 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_query_time_filters__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a cumulative metric.
 
       TODO: support metric time filters
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
index aa9b912d6..cc1063504 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a cumulative metric.
 
       TODO: support metric time filters
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers', 'listing__country_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
index 316a8d9ac..6699ec074 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
@@ -10,6 +10,7 @@ docstring:
 
       The metric listed here has one input that filters on bookings__is_instant and another that does not, which means
       the source input for the latter input must NOT have the filter applied to it.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
index 7a278ac5b..3a8e14329 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
@@ -10,6 +10,7 @@ docstring:
 
       The metric listed here has one input that filters on bookings__is_instant and another that does not, which means
       the source input for the latter input must NOT have the filter applied to it.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
index 82b90bb02..3d1cc0484 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a metric with a time spine and fill_nulls_with enabled.
 
       TODO: support metric time filters
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
index c002c5ca7..0910734c3 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a metric with a time spine and fill_nulls_with enabled.
 
       TODO: support metric time filters
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_metric_time_filter_with_two_targets__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_metric_time_filter_with_two_targets__plan0.sql
index 80c29272b..841d822a7 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_metric_time_filter_with_two_targets__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_metric_time_filter_with_two_targets__plan0.sql
@@ -5,6 +5,7 @@ docstring:
 
       This is currently a no-op for the pushdown optimizer.
       TODO: support metric time pushdown
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_metric_time_filter_with_two_targets__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_metric_time_filter_with_two_targets__plan0_optimized.sql
index fff21f640..75e9c7d39 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_metric_time_filter_with_two_targets__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_metric_time_filter_with_two_targets__plan0_optimized.sql
@@ -5,6 +5,7 @@ docstring:
 
       This is currently a no-op for the pushdown optimizer.
       TODO: support metric time pushdown
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_categorical_dimension_pushdown__plan0.sql
index 6c0f2ca7f..c67b12965 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_categorical_dimension_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_categorical_dimension_pushdown__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multiple_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for more than one categorical dimension.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
index c76f7f142..36af953e6 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multiple_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for more than one categorical dimension.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings', 'user__home_state_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0.sql
index a627ce7bf..ff34039aa 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a derived offset metric.
 
       TODO: support metric time filters
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0_optimized.sql
index 3a91a82d2..0fbcd96ac 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a derived offset metric.
 
       TODO: support metric time filters
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_saved_query_with_metric_joins_and_filter__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_saved_query_with_metric_joins_and_filter__plan0.sql
index feabf4a96..9c7753587 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_saved_query_with_metric_joins_and_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_saved_query_with_metric_joins_and_filter__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
index 0c1bf25a6..4076772c0 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
index 29c579a38..c360f2724 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
index 85d504199..9abfe0b08 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_single_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_single_categorical_dimension_pushdown__plan0.sql
index 5c0b6fe6e..365a0ede2 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_single_categorical_dimension_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_single_categorical_dimension_pushdown__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_single_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for a single categorical dimension.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_single_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_single_categorical_dimension_pushdown__plan0_optimized.sql
index 62acfda0a..c897a3b77 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_single_categorical_dimension_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_single_categorical_dimension_pushdown__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_single_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for a single categorical dimension.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_skipped_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_skipped_pushdown__plan0.sql
index 79c655d39..0f8db7031 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_skipped_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_skipped_pushdown__plan0.sql
@@ -7,6 +7,7 @@ docstring:
       skip pushdown, typically due to a lack of certainty over whether or not the query will return the same results.
 
       The specific scenario is less important here than that it match one that should not be pushed down.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_skipped_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_skipped_pushdown__plan0_optimized.sql
index e0f56965f..74426c3ec 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_skipped_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Snowflake/test_skipped_pushdown__plan0_optimized.sql
@@ -7,6 +7,7 @@ docstring:
       skip pushdown, typically due to a lack of certainty over whether or not the query will return the same results.
 
       The specific scenario is less important here than that it match one that should not be pushed down.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_query_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_query_filters__plan0.sql
index 2277f3bd2..9e4564967 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_query_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_query_filters__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_query_filters
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests pushdown optimizer behavior for a simple predicate on a conversion metric.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_query_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_query_filters__plan0_optimized.sql
index 4d3d7932c..80f869fb2 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_query_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_conversion_metric_query_filters__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_conversion_metric_query_filters
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests pushdown optimizer behavior for a simple predicate on a conversion metric.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_query_time_filters__plan0.sql
index d72c6ae78..2c71ec951 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_query_time_filters__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a cumulative metric.
 
       TODO: support metric time filters
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
index e27dc2bf6..baaab50aa 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_cumulative_metric_with_query_time_filters__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a cumulative metric.
 
       TODO: support metric time filters
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookers', 'listing__country_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
index 7204cc731..d4e6f8cba 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_different_filters_on_same_measure_source_categorical_dimension__plan0.sql
@@ -10,6 +10,7 @@ docstring:
 
       The metric listed here has one input that filters on bookings__is_instant and another that does not, which means
       the source input for the latter input must NOT have the filter applied to it.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
index 7a278ac5b..88489a386 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_different_filters_on_same_measure_source_categorical_dimension__plan0_optimized.sql
@@ -10,6 +10,7 @@ docstring:
 
       The metric listed here has one input that filters on bookings__is_instant and another that does not, which means
       the source input for the latter input must NOT have the filter applied to it.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
index 0f94785d8..470312fbd 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a metric with a time spine and fill_nulls_with enabled.
 
       TODO: support metric time filters
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
index 9c0ef0618..0a8042dc5 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a metric with a time spine and fill_nulls_with enabled.
 
       TODO: support metric time filters
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_metric_time_filter_with_two_targets__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_metric_time_filter_with_two_targets__plan0.sql
index 17fbdb618..dd3a863b0 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_metric_time_filter_with_two_targets__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_metric_time_filter_with_two_targets__plan0.sql
@@ -5,6 +5,7 @@ docstring:
 
       This is currently a no-op for the pushdown optimizer.
       TODO: support metric time pushdown
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_metric_time_filter_with_two_targets__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_metric_time_filter_with_two_targets__plan0_optimized.sql
index fff21f640..649c996ac 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_metric_time_filter_with_two_targets__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_metric_time_filter_with_two_targets__plan0_optimized.sql
@@ -5,6 +5,7 @@ docstring:
 
       This is currently a no-op for the pushdown optimizer.
       TODO: support metric time pushdown
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_categorical_dimension_pushdown__plan0.sql
index 069435399..66fb3b6aa 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_categorical_dimension_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_categorical_dimension_pushdown__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multiple_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for more than one categorical dimension.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
index c76f7f142..6238c98a7 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_multiple_categorical_dimension_pushdown__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multiple_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for more than one categorical dimension.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listings', 'user__home_state_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_offset_metric_with_query_time_filters__plan0.sql
index fb6ecb218..2b83441e1 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_offset_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_offset_metric_with_query_time_filters__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a derived offset metric.
 
       TODO: support metric time filters
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_offset_metric_with_query_time_filters__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_offset_metric_with_query_time_filters__plan0_optimized.sql
index 7d23164e8..2187c0708 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_offset_metric_with_query_time_filters__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_offset_metric_with_query_time_filters__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests pushdown optimizer behavior for a query against a derived offset metric.
 
       TODO: support metric time filters
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_saved_query_with_metric_joins_and_filter__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_saved_query_with_metric_joins_and_filter__plan0.sql
index f1010eb08..6dc5e2244 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_saved_query_with_metric_joins_and_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_saved_query_with_metric_joins_and_filter__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
index 0c1bf25a6..91f21bfa1 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_saved_query_with_metric_joins_and_filter__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
index 3210c9e53..cb7e3c783 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
index 85d504199..cc5b200f4 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Tests rendering a query where we join to a time spine and query the filter input.
 
       This should produce a SQL query that applies the filter outside of the time spine join.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_single_categorical_dimension_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_single_categorical_dimension_pushdown__plan0.sql
index 894f4591a..1aa793430 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_single_categorical_dimension_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_single_categorical_dimension_pushdown__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_single_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for a single categorical dimension.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_single_categorical_dimension_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_single_categorical_dimension_pushdown__plan0_optimized.sql
index 62acfda0a..a02725b11 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_single_categorical_dimension_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_single_categorical_dimension_pushdown__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_single_categorical_dimension_pushdown
 test_filename: test_predicate_pushdown_rendering.py
 docstring:
   Tests rendering a query where we expect predicate pushdown for a single categorical dimension.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_skipped_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_skipped_pushdown__plan0.sql
index 47fef186b..64381ce2e 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_skipped_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_skipped_pushdown__plan0.sql
@@ -7,6 +7,7 @@ docstring:
       skip pushdown, typically due to a lack of certainty over whether or not the query will return the same results.
 
       The specific scenario is less important here than that it match one that should not be pushed down.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_skipped_pushdown__plan0_optimized.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_skipped_pushdown__plan0_optimized.sql
index e0f56965f..969200374 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_skipped_pushdown__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlQueryPlan/Trino/test_skipped_pushdown__plan0_optimized.sql
@@ -7,6 +7,7 @@ docstring:
       skip pushdown, typically due to a lack of certainty over whether or not the query will return the same results.
 
       The specific scenario is less important here than that it match one that should not be pushed down.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'listing__country_latest']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql
index 42b1e0db7..cba4c7799 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_common_semantic_model
 test_filename: test_query_rendering.py
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0_optimized.sql
index 60e4266f6..dd60042a0 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_common_semantic_model
 test_filename: test_query_rendering.py
+sql_engine: BigQuery
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql
index 90412b40a..f67cf01b1 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get distinct values for a dimension.
+sql_engine: BigQuery
 ---
 -- Order By ['listing__country_latest'] Limit 100
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0_optimized.sql
index 8c59ff210..c2fb80801 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get distinct values for a dimension.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__country_latest',]
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 8e043b0ef..577815e6b 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_on_join_dim
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
index bed21753f..e07bc2c47 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_on_join_dim
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'booking__is_instant']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
index 02f2bd4eb..626bb3692 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension with a validity window inside a measure constraint.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
index 5e2c0303e..9c5126678 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension with a validity window inside a measure constraint.
+sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql
index 1f48dbe76..b92899870 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_limit_rows
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan with a limit to the number of rows returned.
+sql_engine: BigQuery
 ---
 -- Order By [] Limit 1
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0_optimized.sql
index 43d4b6eb5..8482b37eb 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_limit_rows
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan with a limit to the number of rows returned.
+sql_engine: BigQuery
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
index 6edaea28c..7ee5532c7 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_local_dimension_using_local_entity
 test_filename: test_query_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0_optimized.sql
index b0b62597f..a34e5dc37 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_local_dimension_using_local_entity
 test_filename: test_query_rendering.py
+sql_engine: BigQuery
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql
index 65d4732f5..983a839d2 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint
 test_filename: test_query_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0_optimized.sql
index ab135619b..407adbf90 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint
 test_filename: test_query_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
index b3c269900..c62f6fa1a 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_reused_measure
 test_filename: test_query_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0_optimized.sql
index e09d10211..df236298a 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_reused_measure
 test_filename: test_query_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 4374f6edd..7204fb883 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_single_expr_and_alias
 test_filename: test_query_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
index e6c54c1bd..1d74c8190 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_single_expr_and_alias
 test_filename: test_query_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index b6c9b2c2d..59076fca3 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_with_measures_from_multiple_sources_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
index d231fa8be..62a40bc24 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_with_measures_from_multiple_sources_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time__plan0.sql
index aeef010bf..2cbbf57d1 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time.
+sql_engine: BigQuery
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time__plan0_optimized.sql
index 1fec15d79..683ffb473 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time.
+sql_engine: BigQuery
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time_week__plan0.sql
index 0d116d162..285398b5d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time_week__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time_week__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time_week
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time with non-default granularity.
+sql_engine: BigQuery
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time_week__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time_week__plan0_optimized.sql
index 76e59f03c..02a975703 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time_week__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_metric_time_week__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time_week
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time with non-default granularity.
+sql_engine: BigQuery
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_categorical__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_categorical__plan0.sql
index 987f120fe..12bab9b8a 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_categorical__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_categorical__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_categorical
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a categorical dimension.
+sql_engine: BigQuery
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_categorical__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_categorical__plan0_optimized.sql
index 9de785ebe..efee55656 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_categorical__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_categorical__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_categorical
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a categorical dimension.
+sql_engine: BigQuery
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time__plan0.sql
index 637b8a4cb..95b40701d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension.
+sql_engine: BigQuery
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time__plan0_optimized.sql
index 8044c9d46..7c195eb40 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension.
+sql_engine: BigQuery
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time_quarter__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time_quarter__plan0.sql
index f50753200..ffbfe072b 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time_quarter__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time_quarter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time_quarter
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension and non-default granularity.
+sql_engine: BigQuery
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time_quarter__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time_quarter__plan0_optimized.sql
index cc5ae6272..88f8d5c98 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time_quarter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time_quarter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time_quarter
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension and non-default granularity.
+sql_engine: BigQuery
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
index 9cdf72ddb..b1f1a5b6a 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_through_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension that is reached through an SCD table.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index 3676b5e53..f84757956 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_through_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension that is reached through an SCD table.
+sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__user__home_state_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
index f32cb5fd8..50ecd7063 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using an SCD dimension that is reached through another table.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index f4764e593..6b6548794 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using an SCD dimension that is reached through another table.
+sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__lux_listing__is_confirmed_lux', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
index 2635900f1..f7b62444c 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multihop_node
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0_optimized.sql
index fefdec9a3..310953898 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multihop_node
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['txn_count', 'account_id__customer_id__customer_name']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
index 5deedc9cf..b696eddc0 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0_optimized.sql
index 7fb75f25f..e273bc2e0 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_non_additive_dimension_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_non_additive_dimension_with_non_default_grain__plan0.sql
index 233893178..0f1c05553 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_non_additive_dimension_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_non_additive_dimension_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_non_additive_dimension_with_non_default_grain
 test_filename: test_query_rendering.py
 docstring:
   Tests querying a metric with a non-additive agg_time_dimension that has non-default granularity.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
index 413e50828..72a67293d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_non_additive_dimension_with_non_default_grain
 test_filename: test_query_rendering.py
 docstring:
   Tests querying a metric with a non-additive agg_time_dimension that has non-default granularity.
+sql_engine: BigQuery
 ---
 -- Join on MIN(ds_month) and [] grouping by None
 -- Pass Only Elements: ['total_account_balance_first_day_of_month',]
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql
index 08965b0b9..b8e833adc 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_partitioned_join
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan where there's a join on a partitioned dimension.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0_optimized.sql
index f5877f4cc..81d87257e 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_partitioned_join
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan where there's a join on a partitioned dimension.
+sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['identity_verifications', 'user__home_state']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql
index a928cc2f9..63dd1bd3a 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_common_semantic_model
 test_filename: test_query_rendering.py
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0_optimized.sql
index 5f4e5efab..3e1ae6aba 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_common_semantic_model
 test_filename: test_query_rendering.py
+sql_engine: Databricks
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql
index 3eda1a319..8a5309da8 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get distinct values for a dimension.
+sql_engine: Databricks
 ---
 -- Order By ['listing__country_latest'] Limit 100
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_distinct_values__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_distinct_values__plan0_optimized.sql
index 8c59ff210..0f02c165d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_distinct_values__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_distinct_values__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get distinct values for a dimension.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__country_latest',]
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 2e785ef27..02148f67c 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_on_join_dim
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
index bed21753f..eac888634 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_on_join_dim
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'booking__is_instant']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
index 335ba2dcc..a9da8c174 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension with a validity window inside a measure constraint.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
index ff5690ae8..4072f9de1 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension with a validity window inside a measure constraint.
+sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql
index ce24e8ac0..757484e31 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_limit_rows
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan with a limit to the number of rows returned.
+sql_engine: Databricks
 ---
 -- Order By [] Limit 1
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_limit_rows__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_limit_rows__plan0_optimized.sql
index 81ab67b44..3522e48cc 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_limit_rows__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_limit_rows__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_limit_rows
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan with a limit to the number of rows returned.
+sql_engine: Databricks
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql
index ef64add98..dc0642dc8 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_local_dimension_using_local_entity
 test_filename: test_query_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0_optimized.sql
index b0b62597f..0a5e36f7d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_local_dimension_using_local_entity
 test_filename: test_query_rendering.py
+sql_engine: Databricks
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql
index a4a3aa27f..31c7a75b8 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint
 test_filename: test_query_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0_optimized.sql
index eb3f667db..32b76b94d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint
 test_filename: test_query_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql
index b583ac9af..8f8e17b92 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_reused_measure
 test_filename: test_query_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0_optimized.sql
index 3138e7362..0fb229c3c 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_reused_measure
 test_filename: test_query_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index ddfcd211b..9f1a62f3c 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_single_expr_and_alias
 test_filename: test_query_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
index 80d1ee2c1..5be1cd7cc 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_single_expr_and_alias
 test_filename: test_query_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index aac0673d6..b6751fff4 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_with_measures_from_multiple_sources_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
index 5a7d6f467..35ffb7205 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_with_measures_from_multiple_sources_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time__plan0.sql
index 4180d10ed..6dcff193e 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time.
+sql_engine: Databricks
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time__plan0_optimized.sql
index b2bc49b19..05af533f5 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time.
+sql_engine: Databricks
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time_week__plan0.sql
index d2d37b386..9e3b8342d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time_week__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time_week__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time_week
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time with non-default granularity.
+sql_engine: Databricks
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time_week__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time_week__plan0_optimized.sql
index 38587f10c..ae85aa671 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time_week__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_metric_time_week__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time_week
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time with non-default granularity.
+sql_engine: Databricks
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_categorical__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_categorical__plan0.sql
index 9d4bb9056..786336515 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_categorical__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_categorical__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_categorical
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a categorical dimension.
+sql_engine: Databricks
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_categorical__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_categorical__plan0_optimized.sql
index f00d4147d..f38aaa369 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_categorical__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_categorical__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_categorical
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a categorical dimension.
+sql_engine: Databricks
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time__plan0.sql
index bc6ea679d..46b47d2f8 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension.
+sql_engine: Databricks
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time__plan0_optimized.sql
index 57b909fc6..0e267e92b 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension.
+sql_engine: Databricks
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time_quarter__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time_quarter__plan0.sql
index 4c44dbe3c..4687c4724 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time_quarter__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time_quarter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time_quarter
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension and non-default granularity.
+sql_engine: Databricks
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time_quarter__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time_quarter__plan0_optimized.sql
index 2d5dbc11e..085363b16 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time_quarter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time_quarter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time_quarter
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension and non-default granularity.
+sql_engine: Databricks
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
index 47217caff..fe0295392 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_through_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension that is reached through an SCD table.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index abeb23557..0d617c1f9 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_through_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension that is reached through an SCD table.
+sql_engine: Databricks
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__user__home_state_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
index 261e6a42b..f8cff778a 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using an SCD dimension that is reached through another table.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index 27dd0f085..0e04b28cb 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using an SCD dimension that is reached through another table.
+sql_engine: Databricks
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__lux_listing__is_confirmed_lux', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
index 87bc1aa43..13a1fea93 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multihop_node
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multihop_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multihop_node__plan0_optimized.sql
index 6f12342ef..9db1c8587 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multihop_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multihop_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multihop_node
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Databricks
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['txn_count', 'account_id__customer_id__customer_name']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql
index 8469a58d2..2a178a0f4 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0_optimized.sql
index b807f9bac..43de92366 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_non_additive_dimension_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_non_additive_dimension_with_non_default_grain__plan0.sql
index 5c09bb0cf..d9598fc44 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_non_additive_dimension_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_non_additive_dimension_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_non_additive_dimension_with_non_default_grain
 test_filename: test_query_rendering.py
 docstring:
   Tests querying a metric with a non-additive agg_time_dimension that has non-default granularity.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
index 73da294e4..175cce53e 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_non_additive_dimension_with_non_default_grain
 test_filename: test_query_rendering.py
 docstring:
   Tests querying a metric with a non-additive agg_time_dimension that has non-default granularity.
+sql_engine: Databricks
 ---
 -- Join on MIN(ds_month) and [] grouping by None
 -- Pass Only Elements: ['total_account_balance_first_day_of_month',]
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql
index 39b334ecf..2e12fe9c0 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_partitioned_join
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan where there's a join on a partitioned dimension.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0_optimized.sql
index 3f854086c..a48bee885 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_partitioned_join
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan where there's a join on a partitioned dimension.
+sql_engine: Databricks
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['identity_verifications', 'user__home_state']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql
index cd1e667b8..045ddc00c 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_common_semantic_model
 test_filename: test_query_rendering.py
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0_optimized.sql
index 5f4e5efab..45b37d911 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_common_semantic_model
 test_filename: test_query_rendering.py
+sql_engine: DuckDB
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql
index 846fec492..84eca8036 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get distinct values for a dimension.
+sql_engine: DuckDB
 ---
 -- Order By ['listing__country_latest'] Limit 100
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0_optimized.sql
index 8c59ff210..9de2f3b6f 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get distinct values for a dimension.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__country_latest',]
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 7257ebd4d..7b4d174e4 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_on_join_dim
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
index bed21753f..0b0cea714 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_on_join_dim
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'booking__is_instant']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
index 6d07b770c..174392ed8 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension with a validity window inside a measure constraint.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql
index ff5690ae8..fa87d34c1 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension with a validity window inside a measure constraint.
+sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql
index 1df4d24d7..1e225efea 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_limit_rows
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan with a limit to the number of rows returned.
+sql_engine: DuckDB
 ---
 -- Order By [] Limit 1
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0_optimized.sql
index 81ab67b44..2ba193fbb 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_limit_rows
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan with a limit to the number of rows returned.
+sql_engine: DuckDB
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
index fff200836..241c177f4 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_local_dimension_using_local_entity
 test_filename: test_query_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0_optimized.sql
index b0b62597f..a6f523a49 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_local_dimension_using_local_entity
 test_filename: test_query_rendering.py
+sql_engine: DuckDB
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql
index fe6a8f661..575020cf1 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint
 test_filename: test_query_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0_optimized.sql
index eb3f667db..f67cf2b46 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint
 test_filename: test_query_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
index d3f89aab8..17cbd058e 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_reused_measure
 test_filename: test_query_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0_optimized.sql
index 3138e7362..9af38ae99 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_reused_measure
 test_filename: test_query_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 712289e93..a72e56590 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_single_expr_and_alias
 test_filename: test_query_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
index 80d1ee2c1..54f5716b0 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_single_expr_and_alias
 test_filename: test_query_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index b612f6005..308b66af5 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_with_measures_from_multiple_sources_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
index 5a7d6f467..bff861f12 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_with_measures_from_multiple_sources_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time__plan0.sql
index 55344d164..feb9dc92c 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time.
+sql_engine: DuckDB
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time__plan0_optimized.sql
index b2bc49b19..4e3790e19 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time.
+sql_engine: DuckDB
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time_week__plan0.sql
index 81cb14e25..8a2bcf6ab 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time_week__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time_week__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time_week
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time with non-default granularity.
+sql_engine: DuckDB
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time_week__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time_week__plan0_optimized.sql
index 38587f10c..1b92a8653 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time_week__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_metric_time_week__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time_week
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time with non-default granularity.
+sql_engine: DuckDB
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_categorical__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_categorical__plan0.sql
index 905633a01..75e22ed5e 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_categorical__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_categorical__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_categorical
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a categorical dimension.
+sql_engine: DuckDB
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_categorical__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_categorical__plan0_optimized.sql
index f00d4147d..cc3e89a57 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_categorical__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_categorical__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_categorical
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a categorical dimension.
+sql_engine: DuckDB
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time__plan0.sql
index d9f38da7d..9d8c801c1 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension.
+sql_engine: DuckDB
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time__plan0_optimized.sql
index 57b909fc6..232aa3284 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension.
+sql_engine: DuckDB
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time_quarter__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time_quarter__plan0.sql
index 9b584bde6..48e0ea00f 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time_quarter__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time_quarter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time_quarter
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension and non-default granularity.
+sql_engine: DuckDB
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time_quarter__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time_quarter__plan0_optimized.sql
index 2d5dbc11e..c43f5dc00 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time_quarter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time_quarter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time_quarter
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension and non-default granularity.
+sql_engine: DuckDB
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
index c6048ff12..e3fe923e9 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_through_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension that is reached through an SCD table.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index abeb23557..72a13714f 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_through_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension that is reached through an SCD table.
+sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__user__home_state_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
index f147e8dcb..a1b338c20 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using an SCD dimension that is reached through another table.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index 27dd0f085..cefee7b8b 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using an SCD dimension that is reached through another table.
+sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__lux_listing__is_confirmed_lux', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
index d3f56f4d6..2f24b4f59 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multihop_node
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0_optimized.sql
index 6f12342ef..8e437c20f 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multihop_node
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['txn_count', 'account_id__customer_id__customer_name']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
index 071b40194..d9f0c05bd 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0_optimized.sql
index b807f9bac..22bd2f889 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_non_additive_dimension_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_non_additive_dimension_with_non_default_grain__plan0.sql
index 2ac28bc90..a5b32e41a 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_non_additive_dimension_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_non_additive_dimension_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_non_additive_dimension_with_non_default_grain
 test_filename: test_query_rendering.py
 docstring:
   Tests querying a metric with a non-additive agg_time_dimension that has non-default granularity.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
index 73da294e4..8fe0427b4 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_non_additive_dimension_with_non_default_grain
 test_filename: test_query_rendering.py
 docstring:
   Tests querying a metric with a non-additive agg_time_dimension that has non-default granularity.
+sql_engine: DuckDB
 ---
 -- Join on MIN(ds_month) and [] grouping by None
 -- Pass Only Elements: ['total_account_balance_first_day_of_month',]
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql
index 51e7d344b..be232166a 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_partitioned_join
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan where there's a join on a partitioned dimension.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0_optimized.sql
index 3f854086c..51577df66 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_partitioned_join
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan where there's a join on a partitioned dimension.
+sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['identity_verifications', 'user__home_state']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql
index cd1e667b8..5fda19c13 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_common_semantic_model
 test_filename: test_query_rendering.py
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0_optimized.sql
index 5f4e5efab..7b73729f7 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_common_semantic_model
 test_filename: test_query_rendering.py
+sql_engine: Postgres
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql
index 846fec492..6e285b4b5 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get distinct values for a dimension.
+sql_engine: Postgres
 ---
 -- Order By ['listing__country_latest'] Limit 100
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_distinct_values__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_distinct_values__plan0_optimized.sql
index 8c59ff210..2be5ca25e 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_distinct_values__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_distinct_values__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get distinct values for a dimension.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__country_latest',]
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 7257ebd4d..22d0f92c8 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_on_join_dim
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
index bed21753f..add40d147 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_on_join_dim
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'booking__is_instant']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
index 6d07b770c..d50190411 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension with a validity window inside a measure constraint.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
index ff5690ae8..e4de5770b 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension with a validity window inside a measure constraint.
+sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql
index 1df4d24d7..455a7ff9e 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_limit_rows
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan with a limit to the number of rows returned.
+sql_engine: Postgres
 ---
 -- Order By [] Limit 1
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_limit_rows__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_limit_rows__plan0_optimized.sql
index 81ab67b44..d209cf491 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_limit_rows__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_limit_rows__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_limit_rows
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan with a limit to the number of rows returned.
+sql_engine: Postgres
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql
index fff200836..58f265a97 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_local_dimension_using_local_entity
 test_filename: test_query_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0_optimized.sql
index b0b62597f..d421b5dac 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_local_dimension_using_local_entity
 test_filename: test_query_rendering.py
+sql_engine: Postgres
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql
index fe6a8f661..a4905fd64 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint
 test_filename: test_query_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0_optimized.sql
index eb3f667db..4479ea1c9 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint
 test_filename: test_query_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql
index 44a9c6fd4..beeb97393 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_reused_measure
 test_filename: test_query_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0_optimized.sql
index e43c925d8..e17024039 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_reused_measure
 test_filename: test_query_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 712289e93..33ba19018 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_single_expr_and_alias
 test_filename: test_query_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
index 80d1ee2c1..dd13a6123 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_single_expr_and_alias
 test_filename: test_query_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index 80557e5c0..457a342ea 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_with_measures_from_multiple_sources_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
index fcb846d90..f956ae8c4 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_with_measures_from_multiple_sources_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time__plan0.sql
index 55344d164..cab1af4fe 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time.
+sql_engine: Postgres
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time__plan0_optimized.sql
index b2bc49b19..8d7159f5a 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time.
+sql_engine: Postgres
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time_week__plan0.sql
index 81cb14e25..f6d79c2e5 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time_week__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time_week__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time_week
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time with non-default granularity.
+sql_engine: Postgres
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time_week__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time_week__plan0_optimized.sql
index 38587f10c..deac8aacd 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time_week__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_metric_time_week__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time_week
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time with non-default granularity.
+sql_engine: Postgres
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_categorical__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_categorical__plan0.sql
index 905633a01..d138e736a 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_categorical__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_categorical__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_categorical
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a categorical dimension.
+sql_engine: Postgres
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_categorical__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_categorical__plan0_optimized.sql
index f00d4147d..e6e9a96af 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_categorical__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_categorical__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_categorical
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a categorical dimension.
+sql_engine: Postgres
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time__plan0.sql
index d9f38da7d..ab9031890 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension.
+sql_engine: Postgres
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time__plan0_optimized.sql
index 57b909fc6..4cfb4c6a5 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension.
+sql_engine: Postgres
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time_quarter__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time_quarter__plan0.sql
index 9b584bde6..5e761ae72 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time_quarter__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time_quarter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time_quarter
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension and non-default granularity.
+sql_engine: Postgres
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time_quarter__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time_quarter__plan0_optimized.sql
index 2d5dbc11e..56a523560 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time_quarter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time_quarter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time_quarter
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension and non-default granularity.
+sql_engine: Postgres
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
index c6048ff12..c135e6d9d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_through_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension that is reached through an SCD table.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index abeb23557..18afc03d5 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_through_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension that is reached through an SCD table.
+sql_engine: Postgres
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__user__home_state_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
index f147e8dcb..2d797ccd5 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using an SCD dimension that is reached through another table.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index 27dd0f085..48e91011f 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using an SCD dimension that is reached through another table.
+sql_engine: Postgres
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__lux_listing__is_confirmed_lux', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
index d3f56f4d6..7842e7214 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multihop_node
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multihop_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multihop_node__plan0_optimized.sql
index 6f12342ef..4776f107d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multihop_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multihop_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multihop_node
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Postgres
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['txn_count', 'account_id__customer_id__customer_name']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql
index 071b40194..be4d1108d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0_optimized.sql
index b807f9bac..3e92a120c 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_non_additive_dimension_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_non_additive_dimension_with_non_default_grain__plan0.sql
index 2ac28bc90..04eae74c5 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_non_additive_dimension_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_non_additive_dimension_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_non_additive_dimension_with_non_default_grain
 test_filename: test_query_rendering.py
 docstring:
   Tests querying a metric with a non-additive agg_time_dimension that has non-default granularity.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
index 73da294e4..d230b0f70 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_non_additive_dimension_with_non_default_grain
 test_filename: test_query_rendering.py
 docstring:
   Tests querying a metric with a non-additive agg_time_dimension that has non-default granularity.
+sql_engine: Postgres
 ---
 -- Join on MIN(ds_month) and [] grouping by None
 -- Pass Only Elements: ['total_account_balance_first_day_of_month',]
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql
index 51e7d344b..4f1dd18b1 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_partitioned_join
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan where there's a join on a partitioned dimension.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0_optimized.sql
index 3f854086c..6823c1628 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_partitioned_join
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan where there's a join on a partitioned dimension.
+sql_engine: Postgres
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['identity_verifications', 'user__home_state']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql
index 952b5a0d2..67f0c4826 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_common_semantic_model
 test_filename: test_query_rendering.py
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0_optimized.sql
index 5f4e5efab..67fee960e 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_common_semantic_model
 test_filename: test_query_rendering.py
+sql_engine: Redshift
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql
index 774420987..0d1f46fdf 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get distinct values for a dimension.
+sql_engine: Redshift
 ---
 -- Order By ['listing__country_latest'] Limit 100
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_distinct_values__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_distinct_values__plan0_optimized.sql
index 8c59ff210..8b0232ef0 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_distinct_values__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_distinct_values__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get distinct values for a dimension.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__country_latest',]
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 74cf409ac..62f6a0b98 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_on_join_dim
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
index bed21753f..9a1a0f549 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_on_join_dim
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'booking__is_instant']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
index f6fcdcdc1..9c3d49707 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension with a validity window inside a measure constraint.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
index ff5690ae8..c1f0e0f65 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension with a validity window inside a measure constraint.
+sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql
index 3c953fd5c..21518f1e8 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_limit_rows
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan with a limit to the number of rows returned.
+sql_engine: Redshift
 ---
 -- Order By [] Limit 1
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_limit_rows__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_limit_rows__plan0_optimized.sql
index 81ab67b44..eddf57575 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_limit_rows__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_limit_rows__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_limit_rows
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan with a limit to the number of rows returned.
+sql_engine: Redshift
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql
index 2b42645fd..6ff57baaa 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_local_dimension_using_local_entity
 test_filename: test_query_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0_optimized.sql
index b0b62597f..9f2a47919 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_local_dimension_using_local_entity
 test_filename: test_query_rendering.py
+sql_engine: Redshift
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql
index 7fc404599..0012a4d70 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint
 test_filename: test_query_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0_optimized.sql
index eb3f667db..b7754d372 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint
 test_filename: test_query_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql
index 728939b57..65a8a8ea9 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_reused_measure
 test_filename: test_query_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0_optimized.sql
index e43c925d8..bc2d18516 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_reused_measure
 test_filename: test_query_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 204780380..894eeab0f 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_single_expr_and_alias
 test_filename: test_query_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
index 80d1ee2c1..24fc0afc5 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_single_expr_and_alias
 test_filename: test_query_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index 6e457038a..ff2ec4785 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_with_measures_from_multiple_sources_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
index fcb846d90..ba39460c0 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_with_measures_from_multiple_sources_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time__plan0.sql
index 3c222453d..3cce09c59 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time.
+sql_engine: Redshift
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time__plan0_optimized.sql
index b2bc49b19..aa11de8e9 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time.
+sql_engine: Redshift
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time_week__plan0.sql
index 323f4433a..ed0b5bd81 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time_week__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time_week__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time_week
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time with non-default granularity.
+sql_engine: Redshift
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time_week__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time_week__plan0_optimized.sql
index 38587f10c..38dde1efc 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time_week__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_metric_time_week__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time_week
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time with non-default granularity.
+sql_engine: Redshift
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_categorical__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_categorical__plan0.sql
index fc573f215..1237d5e77 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_categorical__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_categorical__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_categorical
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a categorical dimension.
+sql_engine: Redshift
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_categorical__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_categorical__plan0_optimized.sql
index f00d4147d..8b383ac31 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_categorical__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_categorical__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_categorical
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a categorical dimension.
+sql_engine: Redshift
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time__plan0.sql
index ca09f0223..d20f1d519 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension.
+sql_engine: Redshift
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time__plan0_optimized.sql
index 57b909fc6..a78c4edc6 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension.
+sql_engine: Redshift
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time_quarter__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time_quarter__plan0.sql
index 3a14ce0c1..325581fcb 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time_quarter__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time_quarter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time_quarter
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension and non-default granularity.
+sql_engine: Redshift
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time_quarter__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time_quarter__plan0_optimized.sql
index 2d5dbc11e..cdb864600 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time_quarter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time_quarter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time_quarter
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension and non-default granularity.
+sql_engine: Redshift
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
index 83bcd5822..772d43dfd 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_through_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension that is reached through an SCD table.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index abeb23557..a975bce73 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_through_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension that is reached through an SCD table.
+sql_engine: Redshift
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__user__home_state_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
index e2a2221df..8befbd36c 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using an SCD dimension that is reached through another table.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index 27dd0f085..b455ef814 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using an SCD dimension that is reached through another table.
+sql_engine: Redshift
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__lux_listing__is_confirmed_lux', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
index 399c7f18a..63dd92de0 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multihop_node
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multihop_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multihop_node__plan0_optimized.sql
index 6f12342ef..231660b40 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multihop_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multihop_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multihop_node
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Redshift
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['txn_count', 'account_id__customer_id__customer_name']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql
index 520029406..4dadd8451 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0_optimized.sql
index b807f9bac..b56c02e16 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_non_additive_dimension_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_non_additive_dimension_with_non_default_grain__plan0.sql
index 25167fae7..72838790e 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_non_additive_dimension_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_non_additive_dimension_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_non_additive_dimension_with_non_default_grain
 test_filename: test_query_rendering.py
 docstring:
   Tests querying a metric with a non-additive agg_time_dimension that has non-default granularity.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
index 73da294e4..e6687aa07 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_non_additive_dimension_with_non_default_grain
 test_filename: test_query_rendering.py
 docstring:
   Tests querying a metric with a non-additive agg_time_dimension that has non-default granularity.
+sql_engine: Redshift
 ---
 -- Join on MIN(ds_month) and [] grouping by None
 -- Pass Only Elements: ['total_account_balance_first_day_of_month',]
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql
index 5fd66fd52..f357fc8ed 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_partitioned_join
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan where there's a join on a partitioned dimension.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0_optimized.sql
index 3f854086c..4a026709d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_partitioned_join
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan where there's a join on a partitioned dimension.
+sql_engine: Redshift
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['identity_verifications', 'user__home_state']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql
index 602d4c01c..c57924628 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_common_semantic_model
 test_filename: test_query_rendering.py
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0_optimized.sql
index 5f4e5efab..9c6e2074c 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_common_semantic_model
 test_filename: test_query_rendering.py
+sql_engine: Snowflake
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql
index da75f4e90..068829164 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get distinct values for a dimension.
+sql_engine: Snowflake
 ---
 -- Order By ['listing__country_latest'] Limit 100
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0_optimized.sql
index 8c59ff210..57314ea84 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get distinct values for a dimension.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__country_latest',]
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 591d6933d..6d61b42d3 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_on_join_dim
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
index bed21753f..a8eca358a 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_on_join_dim
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'booking__is_instant']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
index 33b5d4a40..8d3d7a64b 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension with a validity window inside a measure constraint.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
index ff5690ae8..3a13d3f95 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension with a validity window inside a measure constraint.
+sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql
index a8992e753..9c1e5b533 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_limit_rows
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan with a limit to the number of rows returned.
+sql_engine: Snowflake
 ---
 -- Order By [] Limit 1
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0_optimized.sql
index 81ab67b44..3dff8ec3b 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_limit_rows
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan with a limit to the number of rows returned.
+sql_engine: Snowflake
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql
index 3624a8a34..8f87bb34e 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_local_dimension_using_local_entity
 test_filename: test_query_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0_optimized.sql
index b0b62597f..489ae16eb 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_local_dimension_using_local_entity
 test_filename: test_query_rendering.py
+sql_engine: Snowflake
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql
index 641ebf8ef..8472f32b6 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint
 test_filename: test_query_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0_optimized.sql
index eb3f667db..ade62236e 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint
 test_filename: test_query_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql
index 8fdf830cc..485543f03 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_reused_measure
 test_filename: test_query_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0_optimized.sql
index 3138e7362..34d2c9ea4 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_reused_measure
 test_filename: test_query_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index eccc138f0..4f403ac64 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_single_expr_and_alias
 test_filename: test_query_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
index 80d1ee2c1..5a05e1279 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_single_expr_and_alias
 test_filename: test_query_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index 0acb72c8e..394820eb2 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_with_measures_from_multiple_sources_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
index 5a7d6f467..c9596e631 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_with_measures_from_multiple_sources_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time__plan0.sql
index afa441b07..373c02b2d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time.
+sql_engine: Snowflake
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time__plan0_optimized.sql
index b2bc49b19..6c55effcd 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time.
+sql_engine: Snowflake
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time_week__plan0.sql
index 4f1e2fb92..8b603b47d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time_week__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time_week__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time_week
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time with non-default granularity.
+sql_engine: Snowflake
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time_week__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time_week__plan0_optimized.sql
index 38587f10c..5e4ee6af6 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time_week__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_metric_time_week__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time_week
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time with non-default granularity.
+sql_engine: Snowflake
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_categorical__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_categorical__plan0.sql
index ab48c92a4..0489b2d4b 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_categorical__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_categorical__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_categorical
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a categorical dimension.
+sql_engine: Snowflake
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_categorical__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_categorical__plan0_optimized.sql
index f00d4147d..6501493cd 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_categorical__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_categorical__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_categorical
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a categorical dimension.
+sql_engine: Snowflake
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time__plan0.sql
index 3be7bbe79..c3d3c9f30 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension.
+sql_engine: Snowflake
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time__plan0_optimized.sql
index 57b909fc6..f37c1aafc 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension.
+sql_engine: Snowflake
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time_quarter__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time_quarter__plan0.sql
index 42980d8e6..087df533c 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time_quarter__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time_quarter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time_quarter
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension and non-default granularity.
+sql_engine: Snowflake
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time_quarter__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time_quarter__plan0_optimized.sql
index 2d5dbc11e..64111760d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time_quarter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time_quarter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time_quarter
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension and non-default granularity.
+sql_engine: Snowflake
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
index 2cf80c656..55d9d68b5 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_through_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension that is reached through an SCD table.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index abeb23557..db9d7849e 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_through_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension that is reached through an SCD table.
+sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__user__home_state_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
index 4036bcd47..55ac09ad6 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using an SCD dimension that is reached through another table.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index 27dd0f085..f4d8783b8 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using an SCD dimension that is reached through another table.
+sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__lux_listing__is_confirmed_lux', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
index 6b24dbf27..1b90357b0 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multihop_node
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0_optimized.sql
index 6f12342ef..a0f29fa1b 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multihop_node
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['txn_count', 'account_id__customer_id__customer_name']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql
index 36d6bf9d2..93fcefefd 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0_optimized.sql
index b807f9bac..fe083b5cd 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_non_additive_dimension_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_non_additive_dimension_with_non_default_grain__plan0.sql
index af55a3b04..2c8b75208 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_non_additive_dimension_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_non_additive_dimension_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_non_additive_dimension_with_non_default_grain
 test_filename: test_query_rendering.py
 docstring:
   Tests querying a metric with a non-additive agg_time_dimension that has non-default granularity.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
index 73da294e4..c9819507a 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_non_additive_dimension_with_non_default_grain
 test_filename: test_query_rendering.py
 docstring:
   Tests querying a metric with a non-additive agg_time_dimension that has non-default granularity.
+sql_engine: Snowflake
 ---
 -- Join on MIN(ds_month) and [] grouping by None
 -- Pass Only Elements: ['total_account_balance_first_day_of_month',]
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql
index 411e7b12a..2e1b91cd2 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_partitioned_join
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan where there's a join on a partitioned dimension.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0_optimized.sql
index 3f854086c..600e14ad8 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_partitioned_join
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan where there's a join on a partitioned dimension.
+sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['identity_verifications', 'user__home_state']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_common_semantic_model__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_common_semantic_model__plan0.sql
index 0b9cf3b0f..43fd63342 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_common_semantic_model__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_common_semantic_model__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_common_semantic_model
 test_filename: test_query_rendering.py
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_common_semantic_model__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_common_semantic_model__plan0_optimized.sql
index 5f4e5efab..90817e067 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_common_semantic_model__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_common_semantic_model__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_common_semantic_model
 test_filename: test_query_rendering.py
+sql_engine: Trino
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_distinct_values__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_distinct_values__plan0.sql
index b8644af8c..45a3f5078 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_distinct_values__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_distinct_values__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get distinct values for a dimension.
+sql_engine: Trino
 ---
 -- Order By ['listing__country_latest'] Limit 100
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_distinct_values__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_distinct_values__plan0_optimized.sql
index 8c59ff210..03bd878e1 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_distinct_values__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_distinct_values__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_distinct_values
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get distinct values for a dimension.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['listing__country_latest',]
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_on_join_dim__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 84ebd5c68..1b0f46600 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_on_join_dim
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
index bed21753f..3dccc5c6f 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_filter_with_where_constraint_on_join_dim__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_filter_with_where_constraint_on_join_dim
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'booking__is_instant']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_join_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_join_to_scd_dimension__plan0.sql
index e89b56629..3d6f41cb2 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_join_to_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_join_to_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension with a validity window inside a measure constraint.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_join_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_join_to_scd_dimension__plan0_optimized.sql
index ff5690ae8..3f0576c0a 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_join_to_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension with a validity window inside a measure constraint.
+sql_engine: Trino
 ---
 -- Constrain Output with WHERE
 -- Pass Only Elements: ['bookings', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_limit_rows__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_limit_rows__plan0.sql
index 731b397e9..7bd15de55 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_limit_rows__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_limit_rows__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_limit_rows
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan with a limit to the number of rows returned.
+sql_engine: Trino
 ---
 -- Order By [] Limit 1
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_limit_rows__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_limit_rows__plan0_optimized.sql
index 81ab67b44..371b54397 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_limit_rows__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_limit_rows__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_limit_rows
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan with a limit to the number of rows returned.
+sql_engine: Trino
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_local_dimension_using_local_entity__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_local_dimension_using_local_entity__plan0.sql
index 9fe23e837..fa4492cfc 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_local_dimension_using_local_entity__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_local_dimension_using_local_entity__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_local_dimension_using_local_entity
 test_filename: test_query_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_local_dimension_using_local_entity__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_local_dimension_using_local_entity__plan0_optimized.sql
index b0b62597f..29f03003a 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_local_dimension_using_local_entity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_local_dimension_using_local_entity__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_local_dimension_using_local_entity
 test_filename: test_query_rendering.py
+sql_engine: Trino
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint__plan0.sql
index 7e764993a..3bde993c0 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint
 test_filename: test_query_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint__plan0_optimized.sql
index eb3f667db..b6a5a7744 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint
 test_filename: test_query_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_reused_measure__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_reused_measure__plan0.sql
index 4a11b45b5..8718e5848 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_reused_measure__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_reused_measure
 test_filename: test_query_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_reused_measure__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_reused_measure__plan0_optimized.sql
index 3138e7362..ffb73d97a 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_reused_measure__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_reused_measure__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_reused_measure
 test_filename: test_query_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index be54cfe16..209577d2e 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_single_expr_and_alias
 test_filename: test_query_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
index 80d1ee2c1..0752177f5 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_measure_constraint_with_single_expr_and_alias__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_measure_constraint_with_single_expr_and_alias
 test_filename: test_query_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index 0b06f1c6e..6a4a55483 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_with_measures_from_multiple_sources_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
index 5a7d6f467..20a4074e4 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_metric_with_measures_from_multiple_sources_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time__plan0.sql
index d2f26f792..fdc0a649d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time.
+sql_engine: Trino
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time__plan0_optimized.sql
index b2bc49b19..549b86aab 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time.
+sql_engine: Trino
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time_week__plan0.sql
index f1d74a087..404d092e4 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time_week__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time_week__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time_week
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time with non-default granularity.
+sql_engine: Trino
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time_week__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time_week__plan0_optimized.sql
index 38587f10c..ab04bab14 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time_week__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_metric_time_week__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_metric_time_week
 test_filename: test_query_rendering.py
 docstring:
   Tests a plan to get the min & max distinct values of metric_time with non-default granularity.
+sql_engine: Trino
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_categorical__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_categorical__plan0.sql
index 760b04497..25614138c 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_categorical__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_categorical__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_categorical
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a categorical dimension.
+sql_engine: Trino
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_categorical__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_categorical__plan0_optimized.sql
index f00d4147d..ea688288d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_categorical__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_categorical__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_categorical
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a categorical dimension.
+sql_engine: Trino
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time__plan0.sql
index 19ffd7bfe..c13bf17e9 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension.
+sql_engine: Trino
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time__plan0_optimized.sql
index 57b909fc6..a3e64a241 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension.
+sql_engine: Trino
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time_quarter__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time_quarter__plan0.sql
index dc4880b68..69cd5e660 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time_quarter__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time_quarter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time_quarter
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension and non-default granularity.
+sql_engine: Trino
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time_quarter__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time_quarter__plan0_optimized.sql
index 2d5dbc11e..af0fc522a 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time_quarter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_min_max_only_time_quarter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_min_max_only_time_quarter
 test_filename: test_query_rendering.py
 docstring:
   Tests a min max only query with a time dimension and non-default granularity.
+sql_engine: Trino
 ---
 -- Calculate min and max
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_through_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_through_scd_dimension__plan0.sql
index 9c7d84fb4..9a0821a7c 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_through_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_through_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension that is reached through an SCD table.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index abeb23557..a4f6f59fd 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_through_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using a dimension that is reached through an SCD table.
+sql_engine: Trino
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__user__home_state_latest', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_to_scd_dimension__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_to_scd_dimension__plan0.sql
index 6449179a4..4a704d943 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_to_scd_dimension__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using an SCD dimension that is reached through another table.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index 27dd0f085..d41e02329 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multi_hop_to_scd_dimension
 test_filename: test_query_rendering.py
 docstring:
   Tests conversion of a plan using an SCD dimension that is reached through another table.
+sql_engine: Trino
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['bookings', 'listing__lux_listing__is_confirmed_lux', 'metric_time__day']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multihop_node__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multihop_node__plan0.sql
index 5fe4f7b66..e52884966 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multihop_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multihop_node__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_multihop_node
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multihop_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multihop_node__plan0_optimized.sql
index 6f12342ef..38dea8bbe 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multihop_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multihop_node__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_multihop_node
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan to a SQL query plan where there is a join between 1 measure and 2 dimensions.
+sql_engine: Trino
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['txn_count', 'account_id__customer_id__customer_name']
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multiple_metrics_no_dimensions__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multiple_metrics_no_dimensions__plan0.sql
index d6d72e664..7acbee8f8 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multiple_metrics_no_dimensions__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multiple_metrics_no_dimensions__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multiple_metrics_no_dimensions__plan0_optimized.sql
index 959a01498..47112df5d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multiple_metrics_no_dimensions__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_multiple_metrics_no_dimensions__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_multiple_metrics_no_dimensions
 test_filename: test_query_rendering.py
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_non_additive_dimension_with_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_non_additive_dimension_with_non_default_grain__plan0.sql
index 79d108954..ae7c202a4 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_non_additive_dimension_with_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_non_additive_dimension_with_non_default_grain__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_non_additive_dimension_with_non_default_grain
 test_filename: test_query_rendering.py
 docstring:
   Tests querying a metric with a non-additive agg_time_dimension that has non-default granularity.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
index 73da294e4..33bc789dc 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_non_additive_dimension_with_non_default_grain__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_non_additive_dimension_with_non_default_grain
 test_filename: test_query_rendering.py
 docstring:
   Tests querying a metric with a non-additive agg_time_dimension that has non-default granularity.
+sql_engine: Trino
 ---
 -- Join on MIN(ds_month) and [] grouping by None
 -- Pass Only Elements: ['total_account_balance_first_day_of_month',]
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_partitioned_join__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_partitioned_join__plan0.sql
index 25d4b44c5..6e3e1e41d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_partitioned_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_partitioned_join__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_partitioned_join
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan where there's a join on a partitioned dimension.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_partitioned_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_partitioned_join__plan0_optimized.sql
index 3f854086c..21868c3db 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_partitioned_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlQueryPlan/Trino/test_partitioned_join__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_partitioned_join
 test_filename: test_query_rendering.py
 docstring:
   Tests converting a dataflow plan where there's a join on a partitioned dimension.
+sql_engine: Trino
 ---
 -- Join Standard Outputs
 -- Pass Only Elements: ['identity_verifications', 'user__home_state']
diff --git a/tests_metricflow/snapshots/test_rendered_query.py/str/BigQuery/test_id_enumeration__query.sql b/tests_metricflow/snapshots/test_rendered_query.py/str/BigQuery/test_id_enumeration__query.sql
index b1a350d2d..3c7a4e472 100644
--- a/tests_metricflow/snapshots/test_rendered_query.py/str/BigQuery/test_id_enumeration__query.sql
+++ b/tests_metricflow/snapshots/test_rendered_query.py/str/BigQuery/test_id_enumeration__query.sql
@@ -1,5 +1,6 @@
 test_name: test_id_enumeration
 test_filename: test_rendered_query.py
+sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_rendered_query.py/str/BigQuery/test_render_query__query0.sql b/tests_metricflow/snapshots/test_rendered_query.py/str/BigQuery/test_render_query__query0.sql
index 2d9861973..9884dca88 100644
--- a/tests_metricflow/snapshots/test_rendered_query.py/str/BigQuery/test_render_query__query0.sql
+++ b/tests_metricflow/snapshots/test_rendered_query.py/str/BigQuery/test_render_query__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_query
 test_filename: test_rendered_query.py
+sql_engine: BigQuery
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_rendered_query.py/str/Databricks/test_id_enumeration__query.sql b/tests_metricflow/snapshots/test_rendered_query.py/str/Databricks/test_id_enumeration__query.sql
index 6f36fac99..5c1346422 100644
--- a/tests_metricflow/snapshots/test_rendered_query.py/str/Databricks/test_id_enumeration__query.sql
+++ b/tests_metricflow/snapshots/test_rendered_query.py/str/Databricks/test_id_enumeration__query.sql
@@ -1,5 +1,6 @@
 test_name: test_id_enumeration
 test_filename: test_rendered_query.py
+sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_rendered_query.py/str/Databricks/test_render_query__query0.sql b/tests_metricflow/snapshots/test_rendered_query.py/str/Databricks/test_render_query__query0.sql
index 70d72ba75..a325ef3b2 100644
--- a/tests_metricflow/snapshots/test_rendered_query.py/str/Databricks/test_render_query__query0.sql
+++ b/tests_metricflow/snapshots/test_rendered_query.py/str/Databricks/test_render_query__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_query
 test_filename: test_rendered_query.py
+sql_engine: Databricks
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_rendered_query.py/str/DuckDB/test_id_enumeration__query.sql b/tests_metricflow/snapshots/test_rendered_query.py/str/DuckDB/test_id_enumeration__query.sql
index 6f36fac99..dd9cd665b 100644
--- a/tests_metricflow/snapshots/test_rendered_query.py/str/DuckDB/test_id_enumeration__query.sql
+++ b/tests_metricflow/snapshots/test_rendered_query.py/str/DuckDB/test_id_enumeration__query.sql
@@ -1,5 +1,6 @@
 test_name: test_id_enumeration
 test_filename: test_rendered_query.py
+sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_rendered_query.py/str/DuckDB/test_render_query__query0.sql b/tests_metricflow/snapshots/test_rendered_query.py/str/DuckDB/test_render_query__query0.sql
index 70d72ba75..697030f22 100644
--- a/tests_metricflow/snapshots/test_rendered_query.py/str/DuckDB/test_render_query__query0.sql
+++ b/tests_metricflow/snapshots/test_rendered_query.py/str/DuckDB/test_render_query__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_query
 test_filename: test_rendered_query.py
+sql_engine: DuckDB
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_rendered_query.py/str/Postgres/test_id_enumeration__query.sql b/tests_metricflow/snapshots/test_rendered_query.py/str/Postgres/test_id_enumeration__query.sql
index 6f36fac99..8b32d1151 100644
--- a/tests_metricflow/snapshots/test_rendered_query.py/str/Postgres/test_id_enumeration__query.sql
+++ b/tests_metricflow/snapshots/test_rendered_query.py/str/Postgres/test_id_enumeration__query.sql
@@ -1,5 +1,6 @@
 test_name: test_id_enumeration
 test_filename: test_rendered_query.py
+sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_rendered_query.py/str/Postgres/test_render_query__query0.sql b/tests_metricflow/snapshots/test_rendered_query.py/str/Postgres/test_render_query__query0.sql
index 70d72ba75..b837a2759 100644
--- a/tests_metricflow/snapshots/test_rendered_query.py/str/Postgres/test_render_query__query0.sql
+++ b/tests_metricflow/snapshots/test_rendered_query.py/str/Postgres/test_render_query__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_query
 test_filename: test_rendered_query.py
+sql_engine: Postgres
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_rendered_query.py/str/Redshift/test_id_enumeration__query.sql b/tests_metricflow/snapshots/test_rendered_query.py/str/Redshift/test_id_enumeration__query.sql
index 6f36fac99..27a52649d 100644
--- a/tests_metricflow/snapshots/test_rendered_query.py/str/Redshift/test_id_enumeration__query.sql
+++ b/tests_metricflow/snapshots/test_rendered_query.py/str/Redshift/test_id_enumeration__query.sql
@@ -1,5 +1,6 @@
 test_name: test_id_enumeration
 test_filename: test_rendered_query.py
+sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_rendered_query.py/str/Redshift/test_render_query__query0.sql b/tests_metricflow/snapshots/test_rendered_query.py/str/Redshift/test_render_query__query0.sql
index 70d72ba75..892e519f8 100644
--- a/tests_metricflow/snapshots/test_rendered_query.py/str/Redshift/test_render_query__query0.sql
+++ b/tests_metricflow/snapshots/test_rendered_query.py/str/Redshift/test_render_query__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_query
 test_filename: test_rendered_query.py
+sql_engine: Redshift
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_rendered_query.py/str/Snowflake/test_id_enumeration__query.sql b/tests_metricflow/snapshots/test_rendered_query.py/str/Snowflake/test_id_enumeration__query.sql
index 6f36fac99..004108598 100644
--- a/tests_metricflow/snapshots/test_rendered_query.py/str/Snowflake/test_id_enumeration__query.sql
+++ b/tests_metricflow/snapshots/test_rendered_query.py/str/Snowflake/test_id_enumeration__query.sql
@@ -1,5 +1,6 @@
 test_name: test_id_enumeration
 test_filename: test_rendered_query.py
+sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_rendered_query.py/str/Snowflake/test_render_query__query0.sql b/tests_metricflow/snapshots/test_rendered_query.py/str/Snowflake/test_render_query__query0.sql
index 70d72ba75..a4840287f 100644
--- a/tests_metricflow/snapshots/test_rendered_query.py/str/Snowflake/test_render_query__query0.sql
+++ b/tests_metricflow/snapshots/test_rendered_query.py/str/Snowflake/test_render_query__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_query
 test_filename: test_rendered_query.py
+sql_engine: Snowflake
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_rendered_query.py/str/Trino/test_id_enumeration__query.sql b/tests_metricflow/snapshots/test_rendered_query.py/str/Trino/test_id_enumeration__query.sql
index 6f36fac99..aa7df86eb 100644
--- a/tests_metricflow/snapshots/test_rendered_query.py/str/Trino/test_id_enumeration__query.sql
+++ b/tests_metricflow/snapshots/test_rendered_query.py/str/Trino/test_id_enumeration__query.sql
@@ -1,5 +1,6 @@
 test_name: test_id_enumeration
 test_filename: test_rendered_query.py
+sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
diff --git a/tests_metricflow/snapshots/test_rendered_query.py/str/Trino/test_render_query__query0.sql b/tests_metricflow/snapshots/test_rendered_query.py/str/Trino/test_render_query__query0.sql
index 70d72ba75..90e3901a8 100644
--- a/tests_metricflow/snapshots/test_rendered_query.py/str/Trino/test_render_query__query0.sql
+++ b/tests_metricflow/snapshots/test_rendered_query.py/str/Trino/test_render_query__query0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_query
 test_filename: test_rendered_query.py
+sql_engine: Trino
 ---
 -- Aggregate Measures
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan0.sql
index b3cb816a7..900bfca3e 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: BigQuery
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan1.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan1.sql
index 191affcbe..13facfc7d 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan1.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan1.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: BigQuery
 ---
 -- test1
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan2.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan2.sql
index 7c8f87b9c..bbf3f35ab 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan2.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan2.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: BigQuery
 ---
 -- test2
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan3.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan3.sql
index cffda8fdd..741437340 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan3.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan3.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: BigQuery
 ---
 -- test3
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan4.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan4.sql
index 0327fdd63..03c5978d0 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan4.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan4.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: BigQuery
 ---
 -- test4
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan5.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan5.sql
index fc7004a4e..df201bbd7 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan5.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_component_rendering__plan5.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: BigQuery
 ---
 -- test5
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_create_table_as__create_table_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_create_table_as__create_table_as.sql
index 6b126ad2f..3a91c7b4a 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_create_table_as__create_table_as.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_create_table_as__create_table_as.sql
@@ -1,5 +1,6 @@
 test_name: test_render_create_table_as
 test_filename: test_sql_plan_render.py
+sql_engine: BigQuery
 ---
 CREATE TABLE schema_name.table_name AS (
   -- select_0
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_create_table_as__create_view_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_create_table_as__create_view_as.sql
index 43768106d..a3fcf67a2 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_create_table_as__create_view_as.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_create_table_as__create_view_as.sql
@@ -1,5 +1,6 @@
 test_name: test_render_create_table_as
 test_filename: test_sql_plan_render.py
+sql_engine: BigQuery
 ---
 CREATE VIEW schema_name.table_name AS (
   -- select_0
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_limit__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_limit__plan0.sql
index 8999ff0d2..001caffdb 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_limit__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_limit__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_limit
 test_filename: test_sql_plan_render.py
+sql_engine: BigQuery
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_order_by__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_order_by__plan0.sql
index d5077f356..54e5ddc38 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_order_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_order_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_order_by
 test_filename: test_sql_plan_render.py
+sql_engine: BigQuery
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_where__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_where__plan0.sql
index 9cebbb054..d877f2372 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_where__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/BigQuery/test_render_where__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_where
 test_filename: test_sql_plan_render.py
+sql_engine: BigQuery
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan0.sql
index b3cb816a7..f379678c0 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Databricks
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan1.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan1.sql
index 191affcbe..ac15fa77b 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan1.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan1.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Databricks
 ---
 -- test1
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan2.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan2.sql
index 7c8f87b9c..7e6af1bca 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan2.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan2.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Databricks
 ---
 -- test2
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan3.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan3.sql
index cffda8fdd..31a9ad039 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan3.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan3.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Databricks
 ---
 -- test3
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan4.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan4.sql
index aaaed57ad..4a621fc27 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan4.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan4.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Databricks
 ---
 -- test4
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan5.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan5.sql
index efc798bbb..5ed212403 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan5.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_component_rendering__plan5.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Databricks
 ---
 -- test5
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_create_table_as__create_table_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_create_table_as__create_table_as.sql
index 6b126ad2f..6cff0c96d 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_create_table_as__create_table_as.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_create_table_as__create_table_as.sql
@@ -1,5 +1,6 @@
 test_name: test_render_create_table_as
 test_filename: test_sql_plan_render.py
+sql_engine: Databricks
 ---
 CREATE TABLE schema_name.table_name AS (
   -- select_0
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_create_table_as__create_view_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_create_table_as__create_view_as.sql
index 43768106d..f3a9a1ba6 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_create_table_as__create_view_as.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_create_table_as__create_view_as.sql
@@ -1,5 +1,6 @@
 test_name: test_render_create_table_as
 test_filename: test_sql_plan_render.py
+sql_engine: Databricks
 ---
 CREATE VIEW schema_name.table_name AS (
   -- select_0
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_limit__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_limit__plan0.sql
index 8999ff0d2..69dfd9c1d 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_limit__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_limit__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_limit
 test_filename: test_sql_plan_render.py
+sql_engine: Databricks
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_order_by__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_order_by__plan0.sql
index d5077f356..6592bb10f 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_order_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_order_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_order_by
 test_filename: test_sql_plan_render.py
+sql_engine: Databricks
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_where__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_where__plan0.sql
index 9cebbb054..b3645aa1e 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_where__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Databricks/test_render_where__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_where
 test_filename: test_sql_plan_render.py
+sql_engine: Databricks
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan0.sql
index b3cb816a7..4a011f31f 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: DuckDB
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan1.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan1.sql
index 191affcbe..82bd2b65f 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan1.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan1.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: DuckDB
 ---
 -- test1
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan2.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan2.sql
index 7c8f87b9c..263d87cc6 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan2.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan2.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: DuckDB
 ---
 -- test2
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan3.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan3.sql
index cffda8fdd..d386dcd2b 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan3.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan3.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: DuckDB
 ---
 -- test3
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan4.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan4.sql
index aaaed57ad..bdb90583b 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan4.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan4.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: DuckDB
 ---
 -- test4
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan5.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan5.sql
index efc798bbb..1e658fadd 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan5.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_component_rendering__plan5.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: DuckDB
 ---
 -- test5
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_create_table_as__create_table_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_create_table_as__create_table_as.sql
index 6b126ad2f..d84a6842c 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_create_table_as__create_table_as.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_create_table_as__create_table_as.sql
@@ -1,5 +1,6 @@
 test_name: test_render_create_table_as
 test_filename: test_sql_plan_render.py
+sql_engine: DuckDB
 ---
 CREATE TABLE schema_name.table_name AS (
   -- select_0
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_create_table_as__create_view_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_create_table_as__create_view_as.sql
index 43768106d..e856467e0 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_create_table_as__create_view_as.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_create_table_as__create_view_as.sql
@@ -1,5 +1,6 @@
 test_name: test_render_create_table_as
 test_filename: test_sql_plan_render.py
+sql_engine: DuckDB
 ---
 CREATE VIEW schema_name.table_name AS (
   -- select_0
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_limit__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_limit__plan0.sql
index 8999ff0d2..b82c51af3 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_limit__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_limit__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_limit
 test_filename: test_sql_plan_render.py
+sql_engine: DuckDB
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_order_by__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_order_by__plan0.sql
index d5077f356..e6266ec35 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_order_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_order_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_order_by
 test_filename: test_sql_plan_render.py
+sql_engine: DuckDB
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_where__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_where__plan0.sql
index 9cebbb054..c67dd33ae 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_where__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/DuckDB/test_render_where__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_where
 test_filename: test_sql_plan_render.py
+sql_engine: DuckDB
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan0.sql
index b3cb816a7..d7478058f 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Postgres
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan1.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan1.sql
index 191affcbe..2d827ec11 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan1.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan1.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Postgres
 ---
 -- test1
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan2.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan2.sql
index 7c8f87b9c..bd242cd6b 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan2.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan2.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Postgres
 ---
 -- test2
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan3.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan3.sql
index cffda8fdd..13fbabd32 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan3.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan3.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Postgres
 ---
 -- test3
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan4.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan4.sql
index aaaed57ad..ac5a328d2 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan4.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan4.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Postgres
 ---
 -- test4
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan5.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan5.sql
index efc798bbb..ade3a82c9 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan5.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_component_rendering__plan5.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Postgres
 ---
 -- test5
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_create_table_as__create_table_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_create_table_as__create_table_as.sql
index 6b126ad2f..c5c25ad6a 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_create_table_as__create_table_as.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_create_table_as__create_table_as.sql
@@ -1,5 +1,6 @@
 test_name: test_render_create_table_as
 test_filename: test_sql_plan_render.py
+sql_engine: Postgres
 ---
 CREATE TABLE schema_name.table_name AS (
   -- select_0
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_create_table_as__create_view_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_create_table_as__create_view_as.sql
index 43768106d..a2dba57e9 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_create_table_as__create_view_as.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_create_table_as__create_view_as.sql
@@ -1,5 +1,6 @@
 test_name: test_render_create_table_as
 test_filename: test_sql_plan_render.py
+sql_engine: Postgres
 ---
 CREATE VIEW schema_name.table_name AS (
   -- select_0
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_limit__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_limit__plan0.sql
index 8999ff0d2..227e4e7fb 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_limit__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_limit__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_limit
 test_filename: test_sql_plan_render.py
+sql_engine: Postgres
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_order_by__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_order_by__plan0.sql
index d5077f356..8f6142da5 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_order_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_order_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_order_by
 test_filename: test_sql_plan_render.py
+sql_engine: Postgres
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_where__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_where__plan0.sql
index 9cebbb054..47796c25a 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_where__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Postgres/test_render_where__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_where
 test_filename: test_sql_plan_render.py
+sql_engine: Postgres
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan0.sql
index b3cb816a7..c4742167a 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Redshift
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan1.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan1.sql
index 191affcbe..52c6133c9 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan1.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan1.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Redshift
 ---
 -- test1
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan2.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan2.sql
index 7c8f87b9c..ad6ca93b2 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan2.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan2.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Redshift
 ---
 -- test2
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan3.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan3.sql
index cffda8fdd..a7429d8af 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan3.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan3.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Redshift
 ---
 -- test3
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan4.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan4.sql
index aaaed57ad..b160cb62a 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan4.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan4.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Redshift
 ---
 -- test4
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan5.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan5.sql
index efc798bbb..cfd06335d 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan5.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_component_rendering__plan5.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Redshift
 ---
 -- test5
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_create_table_as__create_table_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_create_table_as__create_table_as.sql
index 6b126ad2f..5349d5634 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_create_table_as__create_table_as.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_create_table_as__create_table_as.sql
@@ -1,5 +1,6 @@
 test_name: test_render_create_table_as
 test_filename: test_sql_plan_render.py
+sql_engine: Redshift
 ---
 CREATE TABLE schema_name.table_name AS (
   -- select_0
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_create_table_as__create_view_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_create_table_as__create_view_as.sql
index 43768106d..6494f80a5 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_create_table_as__create_view_as.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_create_table_as__create_view_as.sql
@@ -1,5 +1,6 @@
 test_name: test_render_create_table_as
 test_filename: test_sql_plan_render.py
+sql_engine: Redshift
 ---
 CREATE VIEW schema_name.table_name AS (
   -- select_0
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_limit__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_limit__plan0.sql
index 8999ff0d2..067da7cf9 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_limit__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_limit__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_limit
 test_filename: test_sql_plan_render.py
+sql_engine: Redshift
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_order_by__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_order_by__plan0.sql
index d5077f356..1360324b8 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_order_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_order_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_order_by
 test_filename: test_sql_plan_render.py
+sql_engine: Redshift
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_where__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_where__plan0.sql
index 9cebbb054..908386450 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_where__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Redshift/test_render_where__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_where
 test_filename: test_sql_plan_render.py
+sql_engine: Redshift
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan0.sql
index b3cb816a7..b9e4b5a8c 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Snowflake
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan1.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan1.sql
index 191affcbe..9aa643f01 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan1.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan1.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Snowflake
 ---
 -- test1
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan2.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan2.sql
index 7c8f87b9c..730458adf 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan2.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan2.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Snowflake
 ---
 -- test2
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan3.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan3.sql
index cffda8fdd..be457dde9 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan3.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan3.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Snowflake
 ---
 -- test3
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan4.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan4.sql
index aaaed57ad..093c5ce65 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan4.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan4.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Snowflake
 ---
 -- test4
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan5.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan5.sql
index efc798bbb..bbeb0e5dc 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan5.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_component_rendering__plan5.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Snowflake
 ---
 -- test5
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_create_table_as__create_table_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_create_table_as__create_table_as.sql
index 6b126ad2f..327c82ade 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_create_table_as__create_table_as.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_create_table_as__create_table_as.sql
@@ -1,5 +1,6 @@
 test_name: test_render_create_table_as
 test_filename: test_sql_plan_render.py
+sql_engine: Snowflake
 ---
 CREATE TABLE schema_name.table_name AS (
   -- select_0
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_create_table_as__create_view_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_create_table_as__create_view_as.sql
index 43768106d..f0c16f344 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_create_table_as__create_view_as.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_create_table_as__create_view_as.sql
@@ -1,5 +1,6 @@
 test_name: test_render_create_table_as
 test_filename: test_sql_plan_render.py
+sql_engine: Snowflake
 ---
 CREATE VIEW schema_name.table_name AS (
   -- select_0
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_limit__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_limit__plan0.sql
index 8999ff0d2..5416eb617 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_limit__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_limit__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_limit
 test_filename: test_sql_plan_render.py
+sql_engine: Snowflake
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_order_by__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_order_by__plan0.sql
index d5077f356..f2c89895b 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_order_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_order_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_order_by
 test_filename: test_sql_plan_render.py
+sql_engine: Snowflake
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_where__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_where__plan0.sql
index 9cebbb054..fb8c7c6af 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_where__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Snowflake/test_render_where__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_where
 test_filename: test_sql_plan_render.py
+sql_engine: Snowflake
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan0.sql
index b3cb816a7..0310d681c 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Trino
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan1.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan1.sql
index 191affcbe..7fab4fa13 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan1.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan1.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Trino
 ---
 -- test1
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan2.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan2.sql
index 7c8f87b9c..4e0a43364 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan2.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan2.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Trino
 ---
 -- test2
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan3.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan3.sql
index cffda8fdd..4da1c0ca2 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan3.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan3.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Trino
 ---
 -- test3
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan4.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan4.sql
index aaaed57ad..1d242b0fc 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan4.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan4.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Trino
 ---
 -- test4
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan5.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan5.sql
index efc798bbb..97a7b71c6 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan5.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_component_rendering__plan5.sql
@@ -2,6 +2,7 @@ test_name: test_component_rendering
 test_filename: test_sql_plan_render.py
 docstring:
   Checks that all components of SELECT query are rendered for the 0, 1, >1 component count cases.
+sql_engine: Trino
 ---
 -- test5
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_create_table_as__create_table_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_create_table_as__create_table_as.sql
index 6b126ad2f..71744b04e 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_create_table_as__create_table_as.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_create_table_as__create_table_as.sql
@@ -1,5 +1,6 @@
 test_name: test_render_create_table_as
 test_filename: test_sql_plan_render.py
+sql_engine: Trino
 ---
 CREATE TABLE schema_name.table_name AS (
   -- select_0
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_create_table_as__create_view_as.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_create_table_as__create_view_as.sql
index 43768106d..960d5ffd6 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_create_table_as__create_view_as.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_create_table_as__create_view_as.sql
@@ -1,5 +1,6 @@
 test_name: test_render_create_table_as
 test_filename: test_sql_plan_render.py
+sql_engine: Trino
 ---
 CREATE VIEW schema_name.table_name AS (
   -- select_0
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_limit__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_limit__plan0.sql
index 8999ff0d2..71eee1b4b 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_limit__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_limit__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_limit
 test_filename: test_sql_plan_render.py
+sql_engine: Trino
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_order_by__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_order_by__plan0.sql
index d5077f356..2b4117f06 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_order_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_order_by__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_order_by
 test_filename: test_sql_plan_render.py
+sql_engine: Trino
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_where__plan0.sql b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_where__plan0.sql
index 9cebbb054..a0ccb7ecd 100644
--- a/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_where__plan0.sql
+++ b/tests_metricflow/snapshots/test_sql_plan_render.py/SqlQueryPlan/Trino/test_render_where__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_render_where
 test_filename: test_sql_plan_render.py
+sql_engine: Trino
 ---
 -- test0
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
index bcac1741d..81ec51715 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Check filter hierarchy.
 
       Ensure that the measure filter 'booking__is_instant' doesn't get applied again post-aggregation.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
index d627e7797..955b91916 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Check filter hierarchy.
 
       Ensure that the measure filter 'booking__is_instant' doesn't get applied again post-aggregation.
+sql_engine: BigQuery
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
index a30d39e59..efcf06705 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_with_queried_time_constraint
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric that fills nulls is queried with metric time and a time constraint. Should apply constraint twice.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
index 853c5d10e..d70516ee3 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_with_queried_time_constraint
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric that fills nulls is queried with metric time and a time constraint. Should apply constraint twice.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine__plan0.sql
index 7ba1e7d01..87e01edcf 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_join_to_time_spine
 test_filename: test_time_spine_join_rendering.py
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine__plan0_optimized.sql
index a9b901ace..dc9cd5511 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_join_to_time_spine
 test_filename: test_time_spine_join_rendering.py
+sql_engine: BigQuery
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0.sql
index 1d2a373e4..95e15a664 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is not in group by. Should apply constraint once.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
index 849cf5a36..c76f36ad9 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is not in group by. Should apply constraint once.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
index 50871fdad..485aec53e 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_queried_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is in group by. Should apply constraint twice.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
index 664e68145..4bb4638cf 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_queried_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is in group by. Should apply constraint twice.
+sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
index c5e7bf4f3..c26626165 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Check filter hierarchy.
 
       Ensure that the measure filter 'booking__is_instant' doesn't get applied again post-aggregation.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
index f1bed673d..1fd8daab4 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Check filter hierarchy.
 
       Ensure that the measure filter 'booking__is_instant' doesn't get applied again post-aggregation.
+sql_engine: Databricks
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
index d73c5aab0..937ac3ffb 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_with_queried_time_constraint
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric that fills nulls is queried with metric time and a time constraint. Should apply constraint twice.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
index 39b66c1f7..b9bde1a90 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_with_queried_time_constraint
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric that fills nulls is queried with metric time and a time constraint. Should apply constraint twice.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine__plan0.sql
index 8ec038321..9d356875f 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_join_to_time_spine
 test_filename: test_time_spine_join_rendering.py
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine__plan0_optimized.sql
index 1bf389956..e3aff697e 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_join_to_time_spine
 test_filename: test_time_spine_join_rendering.py
+sql_engine: Databricks
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0.sql
index 8eba1f0ec..f0c133197 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is not in group by. Should apply constraint once.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
index 5df1ff503..dc1e54c55 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is not in group by. Should apply constraint once.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
index c820ae4d9..496635cda 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_queried_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is in group by. Should apply constraint twice.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
index 12e8a0e16..3db4958ce 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_queried_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is in group by. Should apply constraint twice.
+sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
index 22f77d4bc..2c70025e6 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Check filter hierarchy.
 
       Ensure that the measure filter 'booking__is_instant' doesn't get applied again post-aggregation.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
index f1bed673d..7808e01a4 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Check filter hierarchy.
 
       Ensure that the measure filter 'booking__is_instant' doesn't get applied again post-aggregation.
+sql_engine: DuckDB
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
index 17455ec82..0dea70fad 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_with_queried_time_constraint
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric that fills nulls is queried with metric time and a time constraint. Should apply constraint twice.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
index 39b66c1f7..7a8c3b005 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_with_queried_time_constraint
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric that fills nulls is queried with metric time and a time constraint. Should apply constraint twice.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine__plan0.sql
index df554fa24..d3dce420a 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_join_to_time_spine
 test_filename: test_time_spine_join_rendering.py
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine__plan0_optimized.sql
index 1bf389956..c8ecb775a 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_join_to_time_spine
 test_filename: test_time_spine_join_rendering.py
+sql_engine: DuckDB
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0.sql
index 1a3fa1982..a312244cf 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is not in group by. Should apply constraint once.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
index 5df1ff503..8a474a706 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is not in group by. Should apply constraint once.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
index 710065cff..f9de53b44 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_queried_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is in group by. Should apply constraint twice.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
index 12e8a0e16..6a3d97a37 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_queried_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is in group by. Should apply constraint twice.
+sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
index 22f77d4bc..afc210db6 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Check filter hierarchy.
 
       Ensure that the measure filter 'booking__is_instant' doesn't get applied again post-aggregation.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
index f1bed673d..481f3e0cb 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Check filter hierarchy.
 
       Ensure that the measure filter 'booking__is_instant' doesn't get applied again post-aggregation.
+sql_engine: Postgres
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
index 17455ec82..f72fcaf77 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_with_queried_time_constraint
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric that fills nulls is queried with metric time and a time constraint. Should apply constraint twice.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
index 39b66c1f7..b973b60c1 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_with_queried_time_constraint
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric that fills nulls is queried with metric time and a time constraint. Should apply constraint twice.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine__plan0.sql
index df554fa24..d170a3bc2 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_join_to_time_spine
 test_filename: test_time_spine_join_rendering.py
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine__plan0_optimized.sql
index 1bf389956..b3aab0ff2 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_join_to_time_spine
 test_filename: test_time_spine_join_rendering.py
+sql_engine: Postgres
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0.sql
index 1a3fa1982..36dec9d4c 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is not in group by. Should apply constraint once.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
index 5df1ff503..13abbd386 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is not in group by. Should apply constraint once.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
index 710065cff..98cd4008e 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_queried_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is in group by. Should apply constraint twice.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
index 12e8a0e16..91bd1ce2c 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_queried_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is in group by. Should apply constraint twice.
+sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
index 50ec782e5..a6757f92f 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Check filter hierarchy.
 
       Ensure that the measure filter 'booking__is_instant' doesn't get applied again post-aggregation.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
index f1bed673d..bdadc1191 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Check filter hierarchy.
 
       Ensure that the measure filter 'booking__is_instant' doesn't get applied again post-aggregation.
+sql_engine: Redshift
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
index fcaf14278..6afa83005 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_with_queried_time_constraint
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric that fills nulls is queried with metric time and a time constraint. Should apply constraint twice.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
index 39b66c1f7..93aaad5e7 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_with_queried_time_constraint
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric that fills nulls is queried with metric time and a time constraint. Should apply constraint twice.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine__plan0.sql
index cdc589e16..1600b0a68 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_join_to_time_spine
 test_filename: test_time_spine_join_rendering.py
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine__plan0_optimized.sql
index 1bf389956..5b0894fa0 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_join_to_time_spine
 test_filename: test_time_spine_join_rendering.py
+sql_engine: Redshift
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0.sql
index 2c2879f7a..f0c34fb73 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is not in group by. Should apply constraint once.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
index 5df1ff503..9d727697e 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is not in group by. Should apply constraint once.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
index 4917d56a1..70e3e8368 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_queried_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is in group by. Should apply constraint twice.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
index 12e8a0e16..c9793b14c 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_queried_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is in group by. Should apply constraint twice.
+sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
index 7eb11daf5..7066d95c0 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Check filter hierarchy.
 
       Ensure that the measure filter 'booking__is_instant' doesn't get applied again post-aggregation.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
index f1bed673d..66a14eb3f 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Check filter hierarchy.
 
       Ensure that the measure filter 'booking__is_instant' doesn't get applied again post-aggregation.
+sql_engine: Snowflake
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
index e1a1272cf..f5cb4c791 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_with_queried_time_constraint
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric that fills nulls is queried with metric time and a time constraint. Should apply constraint twice.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
index 39b66c1f7..7e5adeaf1 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_with_queried_time_constraint
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric that fills nulls is queried with metric time and a time constraint. Should apply constraint twice.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine__plan0.sql
index 63135f676..8b47c2d9a 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_join_to_time_spine
 test_filename: test_time_spine_join_rendering.py
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine__plan0_optimized.sql
index 1bf389956..7819cc490 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_join_to_time_spine
 test_filename: test_time_spine_join_rendering.py
+sql_engine: Snowflake
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0.sql
index 967bd4792..f5cf75cc5 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is not in group by. Should apply constraint once.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
index 5df1ff503..7f6e67f0d 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is not in group by. Should apply constraint once.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
index 34a944f59..e4fc0e870 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_queried_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is in group by. Should apply constraint twice.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
index 12e8a0e16..b2a37384b 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_queried_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is in group by. Should apply constraint twice.
+sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
index e21c305af..cb0274c9a 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
@@ -4,6 +4,7 @@ docstring:
   Check filter hierarchy.
 
       Ensure that the measure filter 'booking__is_instant' doesn't get applied again post-aggregation.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
index f1bed673d..a39818f65 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0_optimized.sql
@@ -4,6 +4,7 @@ docstring:
   Check filter hierarchy.
 
       Ensure that the measure filter 'booking__is_instant' doesn't get applied again post-aggregation.
+sql_engine: Trino
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
index 1402cf785..0558d88d4 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_with_queried_time_constraint
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric that fills nulls is queried with metric time and a time constraint. Should apply constraint twice.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
index c3b3403d7..86a7e5579 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_join_to_time_spine_with_queried_time_constraint
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric that fills nulls is queried with metric time and a time constraint. Should apply constraint twice.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine__plan0.sql
index 3a9c1c9c1..f06f519a4 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine__plan0.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_join_to_time_spine
 test_filename: test_time_spine_join_rendering.py
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine__plan0_optimized.sql
index 1bf389956..31148d821 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine__plan0_optimized.sql
@@ -1,5 +1,6 @@
 test_name: test_simple_join_to_time_spine
 test_filename: test_time_spine_join_rendering.py
+sql_engine: Trino
 ---
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0.sql
index a50e2561b..ab91dd053 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is not in group by. Should apply constraint once.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
index 5df1ff503..f8f5f9dc0 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is not in group by. Should apply constraint once.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
index c011edd5a..1f49def5b 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_queried_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is in group by. Should apply constraint twice.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
index 12e8a0e16..fd38b34a2 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlQueryPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0_optimized.sql
@@ -2,6 +2,7 @@ test_name: test_simple_join_to_time_spine_with_queried_filter
 test_filename: test_time_spine_join_rendering.py
 docstring:
   Test case where metric fills nulls and filter is in group by. Should apply constraint twice.
+sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT