diff --git a/tests_metricflow/query_rendering/test_custom_granularity.py b/tests_metricflow/query_rendering/test_custom_granularity.py
index 07823f07b..8fd9136af 100644
--- a/tests_metricflow/query_rendering/test_custom_granularity.py
+++ b/tests_metricflow/query_rendering/test_custom_granularity.py
@@ -556,3 +556,58 @@ def test_join_to_time_spine_metric_grouped_by_custom_grain(  # noqa: D103
         dataflow_plan_builder=dataflow_plan_builder,
         query_spec=query_spec,
     )
+
+
+@pytest.mark.sql_engine_snapshot
+def test_join_to_timespine_metric_with_custom_granularity_filter(  # noqa: D103
+    request: FixtureRequest,
+    mf_test_configuration: MetricFlowTestConfiguration,
+    dataflow_plan_builder: DataflowPlanBuilder,
+    dataflow_to_sql_converter: DataflowToSqlQueryPlanConverter,
+    sql_client: SqlClient,
+    query_parser: MetricFlowQueryParser,
+) -> None:
+    query_spec = query_parser.parse_and_validate_query(
+        metric_names=("bookings_join_to_time_spine",),
+        group_by_names=("metric_time__martian_day",),
+        where_constraints=[
+            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('metric_time', 'martian_day') }} = '2020-01-01'"))
+        ],
+    ).query_spec
+
+    render_and_check(
+        request=request,
+        mf_test_configuration=mf_test_configuration,
+        dataflow_to_sql_converter=dataflow_to_sql_converter,
+        sql_client=sql_client,
+        dataflow_plan_builder=dataflow_plan_builder,
+        query_spec=query_spec,
+    )
+
+
+# Results are wrong, martian_day column is not correct. How did that even get rendered?
+@pytest.mark.sql_engine_snapshot
+def test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by(  # noqa: D103
+    request: FixtureRequest,
+    mf_test_configuration: MetricFlowTestConfiguration,
+    dataflow_plan_builder: DataflowPlanBuilder,
+    dataflow_to_sql_converter: DataflowToSqlQueryPlanConverter,
+    sql_client: SqlClient,
+    query_parser: MetricFlowQueryParser,
+) -> None:
+    query_spec = query_parser.parse_and_validate_query(
+        metric_names=("bookings_join_to_time_spine",),
+        group_by_names=("metric_time__day",),
+        where_constraints=[
+            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('metric_time', 'martian_day') }} = '2020-01-01'"))
+        ],
+    ).query_spec
+
+    render_and_check(
+        request=request,
+        mf_test_configuration=mf_test_configuration,
+        dataflow_to_sql_converter=dataflow_to_sql_converter,
+        sql_client=sql_client,
+        dataflow_plan_builder=dataflow_plan_builder,
+        query_spec=query_spec,
+    )
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
new file mode 100644
index 000000000..22ce29543
--- /dev/null
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
@@ -0,0 +1,376 @@
+test_name: test_join_to_timespine_metric_with_custom_granularity_filter
+test_filename: test_custom_granularity.py
+sql_engine: DuckDB
+---
+-- Compute Metrics via Expressions
+SELECT
+  subq_10.metric_time__martian_day
+  , subq_10.bookings AS bookings_join_to_time_spine
+FROM (
+  -- Join to Time Spine Dataset
+  SELECT
+    subq_9.metric_time__martian_day AS metric_time__martian_day
+    , subq_5.bookings AS bookings
+  FROM (
+    -- Pass Only Elements: ['metric_time__martian_day',]
+    SELECT
+      subq_8.metric_time__martian_day
+    FROM (
+      -- Constrain Output with WHERE
+      SELECT
+        subq_7.ds__day
+        , subq_7.ds__martian_day
+        , subq_7.metric_time__martian_day
+        , subq_7.metric_time__day
+      FROM (
+        -- Transform Time Dimension Columns
+        SELECT
+          subq_6.ds__martian_day AS metric_time__martian_day
+          , subq_6.ds__day AS metric_time__day
+          , subq_6.ds__day
+          , subq_6.ds__martian_day
+        FROM (
+          -- Read From Time Spine 'mf_time_spine'
+          SELECT
+            time_spine_src_28006.ds AS ds__day
+            , DATE_TRUNC('week', time_spine_src_28006.ds) AS ds__week
+            , DATE_TRUNC('month', time_spine_src_28006.ds) AS ds__month
+            , DATE_TRUNC('quarter', time_spine_src_28006.ds) AS ds__quarter
+            , DATE_TRUNC('year', time_spine_src_28006.ds) AS ds__year
+            , EXTRACT(year FROM time_spine_src_28006.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM time_spine_src_28006.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM time_spine_src_28006.ds) AS ds__extract_month
+            , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
+            , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
+            , time_spine_src_28006.martian_day AS ds__martian_day
+          FROM ***************************.mf_time_spine time_spine_src_28006
+        ) subq_6
+      ) subq_7
+      WHERE metric_time__martian_day = '2020-01-01'
+    ) subq_8
+    GROUP BY
+      subq_8.metric_time__martian_day
+  ) subq_9
+  LEFT OUTER JOIN (
+    -- Aggregate Measures
+    SELECT
+      subq_4.metric_time__martian_day
+      , SUM(subq_4.bookings) AS bookings
+    FROM (
+      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      SELECT
+        subq_3.metric_time__martian_day
+        , subq_3.bookings
+      FROM (
+        -- Constrain Output with WHERE
+        SELECT
+          subq_2.metric_time__martian_day
+          , subq_2.ds__day
+          , subq_2.ds__week
+          , subq_2.ds__month
+          , subq_2.ds__quarter
+          , subq_2.ds__year
+          , subq_2.ds__extract_year
+          , subq_2.ds__extract_quarter
+          , subq_2.ds__extract_month
+          , subq_2.ds__extract_day
+          , subq_2.ds__extract_dow
+          , subq_2.ds__extract_doy
+          , subq_2.ds_partitioned__day
+          , subq_2.ds_partitioned__week
+          , subq_2.ds_partitioned__month
+          , subq_2.ds_partitioned__quarter
+          , subq_2.ds_partitioned__year
+          , subq_2.ds_partitioned__extract_year
+          , subq_2.ds_partitioned__extract_quarter
+          , subq_2.ds_partitioned__extract_month
+          , subq_2.ds_partitioned__extract_day
+          , subq_2.ds_partitioned__extract_dow
+          , subq_2.ds_partitioned__extract_doy
+          , subq_2.paid_at__day
+          , subq_2.paid_at__week
+          , subq_2.paid_at__month
+          , subq_2.paid_at__quarter
+          , subq_2.paid_at__year
+          , subq_2.paid_at__extract_year
+          , subq_2.paid_at__extract_quarter
+          , subq_2.paid_at__extract_month
+          , subq_2.paid_at__extract_day
+          , subq_2.paid_at__extract_dow
+          , subq_2.paid_at__extract_doy
+          , subq_2.booking__ds__day
+          , subq_2.booking__ds__week
+          , subq_2.booking__ds__month
+          , subq_2.booking__ds__quarter
+          , subq_2.booking__ds__year
+          , subq_2.booking__ds__extract_year
+          , subq_2.booking__ds__extract_quarter
+          , subq_2.booking__ds__extract_month
+          , subq_2.booking__ds__extract_day
+          , subq_2.booking__ds__extract_dow
+          , subq_2.booking__ds__extract_doy
+          , subq_2.booking__ds_partitioned__day
+          , subq_2.booking__ds_partitioned__week
+          , subq_2.booking__ds_partitioned__month
+          , subq_2.booking__ds_partitioned__quarter
+          , subq_2.booking__ds_partitioned__year
+          , subq_2.booking__ds_partitioned__extract_year
+          , subq_2.booking__ds_partitioned__extract_quarter
+          , subq_2.booking__ds_partitioned__extract_month
+          , subq_2.booking__ds_partitioned__extract_day
+          , subq_2.booking__ds_partitioned__extract_dow
+          , subq_2.booking__ds_partitioned__extract_doy
+          , subq_2.booking__paid_at__day
+          , subq_2.booking__paid_at__week
+          , subq_2.booking__paid_at__month
+          , subq_2.booking__paid_at__quarter
+          , subq_2.booking__paid_at__year
+          , subq_2.booking__paid_at__extract_year
+          , subq_2.booking__paid_at__extract_quarter
+          , subq_2.booking__paid_at__extract_month
+          , subq_2.booking__paid_at__extract_day
+          , subq_2.booking__paid_at__extract_dow
+          , subq_2.booking__paid_at__extract_doy
+          , subq_2.metric_time__day
+          , subq_2.metric_time__week
+          , subq_2.metric_time__month
+          , subq_2.metric_time__quarter
+          , subq_2.metric_time__year
+          , subq_2.metric_time__extract_year
+          , subq_2.metric_time__extract_quarter
+          , subq_2.metric_time__extract_month
+          , subq_2.metric_time__extract_day
+          , subq_2.metric_time__extract_dow
+          , subq_2.metric_time__extract_doy
+          , subq_2.listing
+          , subq_2.guest
+          , subq_2.host
+          , subq_2.booking__listing
+          , subq_2.booking__guest
+          , subq_2.booking__host
+          , subq_2.is_instant
+          , subq_2.booking__is_instant
+          , subq_2.bookings
+          , subq_2.instant_bookings
+          , subq_2.booking_value
+          , subq_2.max_booking_value
+          , subq_2.min_booking_value
+          , subq_2.bookers
+          , subq_2.average_booking_value
+          , subq_2.referred_bookings
+          , subq_2.median_booking_value
+          , subq_2.booking_value_p99
+          , subq_2.discrete_booking_value_p99
+          , subq_2.approximate_continuous_booking_value_p99
+          , subq_2.approximate_discrete_booking_value_p99
+        FROM (
+          -- Metric Time Dimension 'ds'
+          -- Join to Custom Granularity Dataset
+          SELECT
+            subq_0.ds__day AS ds__day
+            , subq_0.ds__week AS ds__week
+            , subq_0.ds__month AS ds__month
+            , subq_0.ds__quarter AS ds__quarter
+            , subq_0.ds__year AS ds__year
+            , subq_0.ds__extract_year AS ds__extract_year
+            , subq_0.ds__extract_quarter AS ds__extract_quarter
+            , subq_0.ds__extract_month AS ds__extract_month
+            , subq_0.ds__extract_day AS ds__extract_day
+            , subq_0.ds__extract_dow AS ds__extract_dow
+            , subq_0.ds__extract_doy AS ds__extract_doy
+            , subq_0.ds_partitioned__day AS ds_partitioned__day
+            , subq_0.ds_partitioned__week AS ds_partitioned__week
+            , subq_0.ds_partitioned__month AS ds_partitioned__month
+            , subq_0.ds_partitioned__quarter AS ds_partitioned__quarter
+            , subq_0.ds_partitioned__year AS ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
+            , subq_0.paid_at__day AS paid_at__day
+            , subq_0.paid_at__week AS paid_at__week
+            , subq_0.paid_at__month AS paid_at__month
+            , subq_0.paid_at__quarter AS paid_at__quarter
+            , subq_0.paid_at__year AS paid_at__year
+            , subq_0.paid_at__extract_year AS paid_at__extract_year
+            , subq_0.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_0.paid_at__extract_month AS paid_at__extract_month
+            , subq_0.paid_at__extract_day AS paid_at__extract_day
+            , subq_0.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_0.paid_at__extract_doy AS paid_at__extract_doy
+            , subq_0.booking__ds__day AS booking__ds__day
+            , subq_0.booking__ds__week AS booking__ds__week
+            , subq_0.booking__ds__month AS booking__ds__month
+            , subq_0.booking__ds__quarter AS booking__ds__quarter
+            , subq_0.booking__ds__year AS booking__ds__year
+            , subq_0.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_0.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_0.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy AS booking__ds__extract_doy
+            , subq_0.booking__ds_partitioned__day AS booking__ds_partitioned__day
+            , subq_0.booking__ds_partitioned__week AS booking__ds_partitioned__week
+            , subq_0.booking__ds_partitioned__month AS booking__ds_partitioned__month
+            , subq_0.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
+            , subq_0.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
+            , subq_0.booking__paid_at__day AS booking__paid_at__day
+            , subq_0.booking__paid_at__week AS booking__paid_at__week
+            , subq_0.booking__paid_at__month AS booking__paid_at__month
+            , subq_0.booking__paid_at__quarter AS booking__paid_at__quarter
+            , subq_0.booking__paid_at__year AS booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
+            , subq_0.ds__day AS metric_time__day
+            , subq_0.ds__week AS metric_time__week
+            , subq_0.ds__month AS metric_time__month
+            , subq_0.ds__quarter AS metric_time__quarter
+            , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
+            , subq_0.listing AS listing
+            , subq_0.guest AS guest
+            , subq_0.host AS host
+            , subq_0.booking__listing AS booking__listing
+            , subq_0.booking__guest AS booking__guest
+            , subq_0.booking__host AS booking__host
+            , subq_0.is_instant AS is_instant
+            , subq_0.booking__is_instant AS booking__is_instant
+            , subq_0.bookings AS bookings
+            , subq_0.instant_bookings AS instant_bookings
+            , subq_0.booking_value AS booking_value
+            , subq_0.max_booking_value AS max_booking_value
+            , subq_0.min_booking_value AS min_booking_value
+            , subq_0.bookers AS bookers
+            , subq_0.average_booking_value AS average_booking_value
+            , subq_0.referred_bookings AS referred_bookings
+            , subq_0.median_booking_value AS median_booking_value
+            , subq_0.booking_value_p99 AS booking_value_p99
+            , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
+            , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
+            , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
+            , subq_1.martian_day AS metric_time__martian_day
+          FROM (
+            -- Read Elements From Semantic Model 'bookings_source'
+            SELECT
+              1 AS bookings
+              , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+              , bookings_source_src_28000.booking_value
+              , bookings_source_src_28000.booking_value AS max_booking_value
+              , bookings_source_src_28000.booking_value AS min_booking_value
+              , bookings_source_src_28000.guest_id AS bookers
+              , bookings_source_src_28000.booking_value AS average_booking_value
+              , bookings_source_src_28000.booking_value AS booking_payments
+              , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+              , bookings_source_src_28000.booking_value AS median_booking_value
+              , bookings_source_src_28000.booking_value AS booking_value_p99
+              , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
+              , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
+              , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
+              , bookings_source_src_28000.is_instant
+              , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
+              , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
+              , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
+              , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
+              , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
+              , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
+              , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
+              , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
+              , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
+              , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
+              , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
+              , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
+              , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
+              , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
+              , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
+              , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
+              , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
+              , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
+              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
+              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
+              , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
+              , bookings_source_src_28000.is_instant AS booking__is_instant
+              , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
+              , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
+              , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
+              , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
+              , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
+              , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
+              , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
+              , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
+              , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
+              , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
+              , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
+              , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
+              , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
+              , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
+              , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
+              , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
+              , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
+              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
+              , bookings_source_src_28000.listing_id AS listing
+              , bookings_source_src_28000.guest_id AS guest
+              , bookings_source_src_28000.host_id AS host
+              , bookings_source_src_28000.listing_id AS booking__listing
+              , bookings_source_src_28000.guest_id AS booking__guest
+              , bookings_source_src_28000.host_id AS booking__host
+            FROM ***************************.fct_bookings bookings_source_src_28000
+          ) subq_0
+          LEFT OUTER JOIN
+            ***************************.mf_time_spine subq_1
+          ON
+            subq_0.ds__day = subq_1.ds
+        ) subq_2
+        WHERE metric_time__martian_day = '2020-01-01'
+      ) subq_3
+    ) subq_4
+    GROUP BY
+      subq_4.metric_time__martian_day
+  ) subq_5
+  ON
+    subq_9.metric_time__martian_day = subq_5.metric_time__martian_day
+) subq_10
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
new file mode 100644
index 000000000..e3c655319
--- /dev/null
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -0,0 +1,56 @@
+test_name: test_join_to_timespine_metric_with_custom_granularity_filter
+test_filename: test_custom_granularity.py
+sql_engine: DuckDB
+---
+-- Join to Time Spine Dataset
+-- Compute Metrics via Expressions
+SELECT
+  subq_20.metric_time__martian_day AS metric_time__martian_day
+  , subq_16.bookings AS bookings_join_to_time_spine
+FROM (
+  -- Constrain Output with WHERE
+  -- Pass Only Elements: ['metric_time__martian_day',]
+  SELECT
+    metric_time__martian_day
+  FROM (
+    -- Read From Time Spine 'mf_time_spine'
+    -- Transform Time Dimension Columns
+    SELECT
+      martian_day AS metric_time__martian_day
+    FROM ***************************.mf_time_spine time_spine_src_28006
+  ) subq_18
+  WHERE metric_time__martian_day = '2020-01-01'
+  GROUP BY
+    metric_time__martian_day
+) subq_20
+LEFT OUTER JOIN (
+  -- Constrain Output with WHERE
+  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Aggregate Measures
+  SELECT
+    metric_time__martian_day
+    , SUM(bookings) AS bookings
+  FROM (
+    -- Metric Time Dimension 'ds'
+    -- Join to Custom Granularity Dataset
+    SELECT
+      subq_11.bookings AS bookings
+      , subq_12.martian_day AS metric_time__martian_day
+    FROM (
+      -- Read Elements From Semantic Model 'bookings_source'
+      SELECT
+        1 AS bookings
+        , DATE_TRUNC('day', ds) AS ds__day
+      FROM ***************************.fct_bookings bookings_source_src_28000
+    ) subq_11
+    LEFT OUTER JOIN
+      ***************************.mf_time_spine subq_12
+    ON
+      subq_11.ds__day = subq_12.ds
+  ) subq_13
+  WHERE metric_time__martian_day = '2020-01-01'
+  GROUP BY
+    metric_time__martian_day
+) subq_16
+ON
+  subq_20.metric_time__martian_day = subq_16.metric_time__martian_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
new file mode 100644
index 000000000..c5e3f7c58
--- /dev/null
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -0,0 +1,374 @@
+test_name: test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by
+test_filename: test_custom_granularity.py
+sql_engine: DuckDB
+---
+-- Compute Metrics via Expressions
+SELECT
+  subq_10.metric_time__day
+  , subq_10.bookings AS bookings_join_to_time_spine
+FROM (
+  -- Join to Time Spine Dataset
+  SELECT
+    subq_9.metric_time__day AS metric_time__day
+    , subq_5.bookings AS bookings
+  FROM (
+    -- Pass Only Elements: ['metric_time__day',]
+    SELECT
+      subq_8.metric_time__day
+    FROM (
+      -- Constrain Output with WHERE
+      SELECT
+        subq_7.ds__day
+        , subq_7.ds__martian_day
+        , subq_7.metric_time__day
+        , subq_7.metric_time__martian_day
+      FROM (
+        -- Transform Time Dimension Columns
+        SELECT
+          subq_6.ds__day AS metric_time__day
+          , subq_6.ds__martian_day AS metric_time__martian_day
+          , subq_6.ds__day
+          , subq_6.ds__martian_day
+        FROM (
+          -- Read From Time Spine 'mf_time_spine'
+          SELECT
+            time_spine_src_28006.ds AS ds__day
+            , DATE_TRUNC('week', time_spine_src_28006.ds) AS ds__week
+            , DATE_TRUNC('month', time_spine_src_28006.ds) AS ds__month
+            , DATE_TRUNC('quarter', time_spine_src_28006.ds) AS ds__quarter
+            , DATE_TRUNC('year', time_spine_src_28006.ds) AS ds__year
+            , EXTRACT(year FROM time_spine_src_28006.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM time_spine_src_28006.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM time_spine_src_28006.ds) AS ds__extract_month
+            , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
+            , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
+            , time_spine_src_28006.martian_day AS ds__martian_day
+          FROM ***************************.mf_time_spine time_spine_src_28006
+        ) subq_6
+      ) subq_7
+      WHERE metric_time__martian_day = '2020-01-01'
+    ) subq_8
+  ) subq_9
+  LEFT OUTER JOIN (
+    -- Aggregate Measures
+    SELECT
+      subq_4.metric_time__day
+      , SUM(subq_4.bookings) AS bookings
+    FROM (
+      -- Pass Only Elements: ['bookings', 'metric_time__day']
+      SELECT
+        subq_3.metric_time__day
+        , subq_3.bookings
+      FROM (
+        -- Constrain Output with WHERE
+        SELECT
+          subq_2.metric_time__martian_day
+          , subq_2.ds__day
+          , subq_2.ds__week
+          , subq_2.ds__month
+          , subq_2.ds__quarter
+          , subq_2.ds__year
+          , subq_2.ds__extract_year
+          , subq_2.ds__extract_quarter
+          , subq_2.ds__extract_month
+          , subq_2.ds__extract_day
+          , subq_2.ds__extract_dow
+          , subq_2.ds__extract_doy
+          , subq_2.ds_partitioned__day
+          , subq_2.ds_partitioned__week
+          , subq_2.ds_partitioned__month
+          , subq_2.ds_partitioned__quarter
+          , subq_2.ds_partitioned__year
+          , subq_2.ds_partitioned__extract_year
+          , subq_2.ds_partitioned__extract_quarter
+          , subq_2.ds_partitioned__extract_month
+          , subq_2.ds_partitioned__extract_day
+          , subq_2.ds_partitioned__extract_dow
+          , subq_2.ds_partitioned__extract_doy
+          , subq_2.paid_at__day
+          , subq_2.paid_at__week
+          , subq_2.paid_at__month
+          , subq_2.paid_at__quarter
+          , subq_2.paid_at__year
+          , subq_2.paid_at__extract_year
+          , subq_2.paid_at__extract_quarter
+          , subq_2.paid_at__extract_month
+          , subq_2.paid_at__extract_day
+          , subq_2.paid_at__extract_dow
+          , subq_2.paid_at__extract_doy
+          , subq_2.booking__ds__day
+          , subq_2.booking__ds__week
+          , subq_2.booking__ds__month
+          , subq_2.booking__ds__quarter
+          , subq_2.booking__ds__year
+          , subq_2.booking__ds__extract_year
+          , subq_2.booking__ds__extract_quarter
+          , subq_2.booking__ds__extract_month
+          , subq_2.booking__ds__extract_day
+          , subq_2.booking__ds__extract_dow
+          , subq_2.booking__ds__extract_doy
+          , subq_2.booking__ds_partitioned__day
+          , subq_2.booking__ds_partitioned__week
+          , subq_2.booking__ds_partitioned__month
+          , subq_2.booking__ds_partitioned__quarter
+          , subq_2.booking__ds_partitioned__year
+          , subq_2.booking__ds_partitioned__extract_year
+          , subq_2.booking__ds_partitioned__extract_quarter
+          , subq_2.booking__ds_partitioned__extract_month
+          , subq_2.booking__ds_partitioned__extract_day
+          , subq_2.booking__ds_partitioned__extract_dow
+          , subq_2.booking__ds_partitioned__extract_doy
+          , subq_2.booking__paid_at__day
+          , subq_2.booking__paid_at__week
+          , subq_2.booking__paid_at__month
+          , subq_2.booking__paid_at__quarter
+          , subq_2.booking__paid_at__year
+          , subq_2.booking__paid_at__extract_year
+          , subq_2.booking__paid_at__extract_quarter
+          , subq_2.booking__paid_at__extract_month
+          , subq_2.booking__paid_at__extract_day
+          , subq_2.booking__paid_at__extract_dow
+          , subq_2.booking__paid_at__extract_doy
+          , subq_2.metric_time__day
+          , subq_2.metric_time__week
+          , subq_2.metric_time__month
+          , subq_2.metric_time__quarter
+          , subq_2.metric_time__year
+          , subq_2.metric_time__extract_year
+          , subq_2.metric_time__extract_quarter
+          , subq_2.metric_time__extract_month
+          , subq_2.metric_time__extract_day
+          , subq_2.metric_time__extract_dow
+          , subq_2.metric_time__extract_doy
+          , subq_2.listing
+          , subq_2.guest
+          , subq_2.host
+          , subq_2.booking__listing
+          , subq_2.booking__guest
+          , subq_2.booking__host
+          , subq_2.is_instant
+          , subq_2.booking__is_instant
+          , subq_2.bookings
+          , subq_2.instant_bookings
+          , subq_2.booking_value
+          , subq_2.max_booking_value
+          , subq_2.min_booking_value
+          , subq_2.bookers
+          , subq_2.average_booking_value
+          , subq_2.referred_bookings
+          , subq_2.median_booking_value
+          , subq_2.booking_value_p99
+          , subq_2.discrete_booking_value_p99
+          , subq_2.approximate_continuous_booking_value_p99
+          , subq_2.approximate_discrete_booking_value_p99
+        FROM (
+          -- Metric Time Dimension 'ds'
+          -- Join to Custom Granularity Dataset
+          SELECT
+            subq_0.ds__day AS ds__day
+            , subq_0.ds__week AS ds__week
+            , subq_0.ds__month AS ds__month
+            , subq_0.ds__quarter AS ds__quarter
+            , subq_0.ds__year AS ds__year
+            , subq_0.ds__extract_year AS ds__extract_year
+            , subq_0.ds__extract_quarter AS ds__extract_quarter
+            , subq_0.ds__extract_month AS ds__extract_month
+            , subq_0.ds__extract_day AS ds__extract_day
+            , subq_0.ds__extract_dow AS ds__extract_dow
+            , subq_0.ds__extract_doy AS ds__extract_doy
+            , subq_0.ds_partitioned__day AS ds_partitioned__day
+            , subq_0.ds_partitioned__week AS ds_partitioned__week
+            , subq_0.ds_partitioned__month AS ds_partitioned__month
+            , subq_0.ds_partitioned__quarter AS ds_partitioned__quarter
+            , subq_0.ds_partitioned__year AS ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
+            , subq_0.paid_at__day AS paid_at__day
+            , subq_0.paid_at__week AS paid_at__week
+            , subq_0.paid_at__month AS paid_at__month
+            , subq_0.paid_at__quarter AS paid_at__quarter
+            , subq_0.paid_at__year AS paid_at__year
+            , subq_0.paid_at__extract_year AS paid_at__extract_year
+            , subq_0.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_0.paid_at__extract_month AS paid_at__extract_month
+            , subq_0.paid_at__extract_day AS paid_at__extract_day
+            , subq_0.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_0.paid_at__extract_doy AS paid_at__extract_doy
+            , subq_0.booking__ds__day AS booking__ds__day
+            , subq_0.booking__ds__week AS booking__ds__week
+            , subq_0.booking__ds__month AS booking__ds__month
+            , subq_0.booking__ds__quarter AS booking__ds__quarter
+            , subq_0.booking__ds__year AS booking__ds__year
+            , subq_0.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_0.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_0.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy AS booking__ds__extract_doy
+            , subq_0.booking__ds_partitioned__day AS booking__ds_partitioned__day
+            , subq_0.booking__ds_partitioned__week AS booking__ds_partitioned__week
+            , subq_0.booking__ds_partitioned__month AS booking__ds_partitioned__month
+            , subq_0.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
+            , subq_0.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
+            , subq_0.booking__paid_at__day AS booking__paid_at__day
+            , subq_0.booking__paid_at__week AS booking__paid_at__week
+            , subq_0.booking__paid_at__month AS booking__paid_at__month
+            , subq_0.booking__paid_at__quarter AS booking__paid_at__quarter
+            , subq_0.booking__paid_at__year AS booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
+            , subq_0.ds__day AS metric_time__day
+            , subq_0.ds__week AS metric_time__week
+            , subq_0.ds__month AS metric_time__month
+            , subq_0.ds__quarter AS metric_time__quarter
+            , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
+            , subq_0.listing AS listing
+            , subq_0.guest AS guest
+            , subq_0.host AS host
+            , subq_0.booking__listing AS booking__listing
+            , subq_0.booking__guest AS booking__guest
+            , subq_0.booking__host AS booking__host
+            , subq_0.is_instant AS is_instant
+            , subq_0.booking__is_instant AS booking__is_instant
+            , subq_0.bookings AS bookings
+            , subq_0.instant_bookings AS instant_bookings
+            , subq_0.booking_value AS booking_value
+            , subq_0.max_booking_value AS max_booking_value
+            , subq_0.min_booking_value AS min_booking_value
+            , subq_0.bookers AS bookers
+            , subq_0.average_booking_value AS average_booking_value
+            , subq_0.referred_bookings AS referred_bookings
+            , subq_0.median_booking_value AS median_booking_value
+            , subq_0.booking_value_p99 AS booking_value_p99
+            , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
+            , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
+            , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
+            , subq_1.martian_day AS metric_time__martian_day
+          FROM (
+            -- Read Elements From Semantic Model 'bookings_source'
+            SELECT
+              1 AS bookings
+              , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+              , bookings_source_src_28000.booking_value
+              , bookings_source_src_28000.booking_value AS max_booking_value
+              , bookings_source_src_28000.booking_value AS min_booking_value
+              , bookings_source_src_28000.guest_id AS bookers
+              , bookings_source_src_28000.booking_value AS average_booking_value
+              , bookings_source_src_28000.booking_value AS booking_payments
+              , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+              , bookings_source_src_28000.booking_value AS median_booking_value
+              , bookings_source_src_28000.booking_value AS booking_value_p99
+              , bookings_source_src_28000.booking_value AS discrete_booking_value_p99
+              , bookings_source_src_28000.booking_value AS approximate_continuous_booking_value_p99
+              , bookings_source_src_28000.booking_value AS approximate_discrete_booking_value_p99
+              , bookings_source_src_28000.is_instant
+              , DATE_TRUNC('day', bookings_source_src_28000.ds) AS ds__day
+              , DATE_TRUNC('week', bookings_source_src_28000.ds) AS ds__week
+              , DATE_TRUNC('month', bookings_source_src_28000.ds) AS ds__month
+              , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS ds__quarter
+              , DATE_TRUNC('year', bookings_source_src_28000.ds) AS ds__year
+              , EXTRACT(year FROM bookings_source_src_28000.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_28000.ds) AS ds__extract_month
+              , EXTRACT(day FROM bookings_source_src_28000.ds) AS ds__extract_day
+              , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_28000.ds) AS ds__extract_doy
+              , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__day
+              , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__week
+              , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__month
+              , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__quarter
+              , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS ds_partitioned__extract_doy
+              , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS paid_at__day
+              , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS paid_at__week
+              , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS paid_at__month
+              , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS paid_at__quarter
+              , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS paid_at__year
+              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS paid_at__extract_month
+              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS paid_at__extract_day
+              , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS paid_at__extract_doy
+              , bookings_source_src_28000.is_instant AS booking__is_instant
+              , DATE_TRUNC('day', bookings_source_src_28000.ds) AS booking__ds__day
+              , DATE_TRUNC('week', bookings_source_src_28000.ds) AS booking__ds__week
+              , DATE_TRUNC('month', bookings_source_src_28000.ds) AS booking__ds__month
+              , DATE_TRUNC('quarter', bookings_source_src_28000.ds) AS booking__ds__quarter
+              , DATE_TRUNC('year', bookings_source_src_28000.ds) AS booking__ds__year
+              , EXTRACT(year FROM bookings_source_src_28000.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_28000.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_28000.ds) AS booking__ds__extract_month
+              , EXTRACT(day FROM bookings_source_src_28000.ds) AS booking__ds__extract_day
+              , EXTRACT(isodow FROM bookings_source_src_28000.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_28000.ds) AS booking__ds__extract_doy
+              , DATE_TRUNC('day', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__day
+              , DATE_TRUNC('week', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__week
+              , DATE_TRUNC('month', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__month
+              , DATE_TRUNC('quarter', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__quarter
+              , DATE_TRUNC('year', bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(year FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(day FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(isodow FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_28000.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , DATE_TRUNC('day', bookings_source_src_28000.paid_at) AS booking__paid_at__day
+              , DATE_TRUNC('week', bookings_source_src_28000.paid_at) AS booking__paid_at__week
+              , DATE_TRUNC('month', bookings_source_src_28000.paid_at) AS booking__paid_at__month
+              , DATE_TRUNC('quarter', bookings_source_src_28000.paid_at) AS booking__paid_at__quarter
+              , DATE_TRUNC('year', bookings_source_src_28000.paid_at) AS booking__paid_at__year
+              , EXTRACT(year FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(day FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(isodow FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_28000.paid_at) AS booking__paid_at__extract_doy
+              , bookings_source_src_28000.listing_id AS listing
+              , bookings_source_src_28000.guest_id AS guest
+              , bookings_source_src_28000.host_id AS host
+              , bookings_source_src_28000.listing_id AS booking__listing
+              , bookings_source_src_28000.guest_id AS booking__guest
+              , bookings_source_src_28000.host_id AS booking__host
+            FROM ***************************.fct_bookings bookings_source_src_28000
+          ) subq_0
+          LEFT OUTER JOIN
+            ***************************.mf_time_spine subq_1
+          ON
+            subq_0.ds__day = subq_1.ds
+        ) subq_2
+        WHERE metric_time__martian_day = '2020-01-01'
+      ) subq_3
+    ) subq_4
+    GROUP BY
+      subq_4.metric_time__day
+  ) subq_5
+  ON
+    subq_9.metric_time__day = subq_5.metric_time__day
+) subq_10
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
new file mode 100644
index 000000000..b88e39932
--- /dev/null
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlQueryPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -0,0 +1,56 @@
+test_name: test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by
+test_filename: test_custom_granularity.py
+sql_engine: DuckDB
+---
+-- Join to Time Spine Dataset
+-- Compute Metrics via Expressions
+SELECT
+  subq_20.metric_time__day AS metric_time__day
+  , subq_16.bookings AS bookings_join_to_time_spine
+FROM (
+  -- Constrain Output with WHERE
+  -- Pass Only Elements: ['metric_time__day',]
+  SELECT
+    metric_time__day
+  FROM (
+    -- Read From Time Spine 'mf_time_spine'
+    -- Transform Time Dimension Columns
+    SELECT
+      ds AS metric_time__day
+      , martian_day AS metric_time__martian_day
+    FROM ***************************.mf_time_spine time_spine_src_28006
+  ) subq_18
+  WHERE metric_time__martian_day = '2020-01-01'
+) subq_20
+LEFT OUTER JOIN (
+  -- Constrain Output with WHERE
+  -- Pass Only Elements: ['bookings', 'metric_time__day']
+  -- Aggregate Measures
+  SELECT
+    metric_time__day
+    , SUM(bookings) AS bookings
+  FROM (
+    -- Metric Time Dimension 'ds'
+    -- Join to Custom Granularity Dataset
+    SELECT
+      subq_11.ds__day AS metric_time__day
+      , subq_11.bookings AS bookings
+      , subq_12.martian_day AS metric_time__martian_day
+    FROM (
+      -- Read Elements From Semantic Model 'bookings_source'
+      SELECT
+        1 AS bookings
+        , DATE_TRUNC('day', ds) AS ds__day
+      FROM ***************************.fct_bookings bookings_source_src_28000
+    ) subq_11
+    LEFT OUTER JOIN
+      ***************************.mf_time_spine subq_12
+    ON
+      subq_11.ds__day = subq_12.ds
+  ) subq_13
+  WHERE metric_time__martian_day = '2020-01-01'
+  GROUP BY
+    metric_time__day
+) subq_16
+ON
+  subq_20.metric_time__day = subq_16.metric_time__day