diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_common_semantic_model__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_common_semantic_model__plan0.xml
index 3811850aef..cd20341e11 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_common_semantic_model__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_common_semantic_model__plan0.xml
@@ -26,6 +26,7 @@
         <!--    'expr': SqlAggregateFunctionExpression(node_id=fnc_4, sql_function=COALESCE),  -->
         <!--    'column_alias': 'metric_time__day'}                                            -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Compute Metrics via Expressions -->
             <!-- node_id = ss_10 -->
@@ -39,6 +40,7 @@
             <!--    'column_alias': 'bookings'}                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = ss_9 -->
@@ -56,6 +58,7 @@
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =                         -->
                     <!--   Pass Only Elements:                 -->
@@ -71,6 +74,7 @@
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Metric Time Dimension 'ds' -->
                         <!-- node_id = ss_7 -->
@@ -468,6 +472,7 @@
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                             <!-- node_id = ss_10001 -->
@@ -825,6 +830,7 @@
                             <!--    'column_alias': 'booking__host'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlTableFromClauseNode>
                                 <!-- description = Read from ***************************.fct_bookings -->
                                 <!-- node_id = tfc_10001 -->
@@ -848,6 +854,7 @@
             <!--    'column_alias': 'booking_value'}                       -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = ss_13 -->
@@ -865,6 +872,7 @@
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =                              -->
                     <!--   Pass Only Elements:                      -->
@@ -880,6 +888,7 @@
                     <!--    'column_alias': 'booking_value'}                       -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Metric Time Dimension 'ds' -->
                         <!-- node_id = ss_11 -->
@@ -1277,6 +1286,7 @@
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                             <!-- node_id = ss_10001 -->
@@ -1634,6 +1644,7 @@
                             <!--    'column_alias': 'booking__host'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlTableFromClauseNode>
                                 <!-- description = Read from ***************************.fct_bookings -->
                                 <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node__plan0.xml
index 76ef510cce..77ef9e9b24 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node__plan0.xml
@@ -16,6 +16,7 @@
         <!--    'column_alias': 'bookings'}                           -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_3) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_3 -->
@@ -41,6 +42,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10),  -->
             <!--    'column_alias': 'listing__country_latest'}            -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Join Standard Outputs -->
                 <!-- node_id = ss_2 -->
@@ -64,6 +66,7 @@
                 <!--    'join_type': SqlJoinType.LEFT_OUTER,                     -->
                 <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =                -->
                     <!--   Pass Only Elements:        -->
@@ -79,6 +82,7 @@
                     <!--    'column_alias': 'bookings'}                          -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                         <!-- node_id = ss_10001 -->
@@ -436,6 +440,7 @@
                         <!--    'column_alias': 'booking__host'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlTableFromClauseNode>
                             <!-- description = Read from ***************************.fct_bookings -->
                             <!-- node_id = tfc_10001 -->
@@ -458,6 +463,7 @@
                     <!--    'column_alias': 'country_latest'}                    -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Read Elements From Semantic Model 'listings_latest' -->
                         <!-- node_id = ss_10004 -->
@@ -687,6 +693,7 @@
                         <!--    'column_alias': 'listing__user'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlTableFromClauseNode>
                             <!-- description = Read from ***************************.dim_listings_latest -->
                             <!-- node_id = tfc_10004 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml
index bd7bff1c0a..a20f2ab36a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml
@@ -16,6 +16,7 @@
         <!--    'column_alias': 'bookings_per_view'}                  -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_23) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Combine Metrics -->
             <!-- node_id = ss_23 -->
@@ -43,6 +44,7 @@
             <!--    'join_type': SqlJoinType.INNER,                         -->
             <!--    'on_condition': SqlLogicalExpression(node_id=lo_4)}     -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Compute Metrics via Expressions -->
                 <!-- node_id = ss_14 -->
@@ -60,6 +62,7 @@
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_13 -->
@@ -85,6 +88,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                     <!--    'column_alias': 'listing__country_latest'}             -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                                           -->
                         <!--   Pass Only Elements:                                   -->
@@ -104,6 +108,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Join Standard Outputs -->
                             <!-- node_id = ss_11 -->
@@ -131,6 +136,7 @@
                             <!--    'join_type': SqlJoinType.LEFT_OUTER,                     -->
                             <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description =                           -->
                                 <!--   Pass Only Elements:                   -->
@@ -150,6 +156,7 @@
                                 <!--    'column_alias': 'bookings'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
                                     <!-- node_id = ss_7 -->
@@ -547,6 +554,7 @@
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlSelectStatementNode>
                                         <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                         <!-- node_id = ss_10001 -->
@@ -904,6 +912,7 @@
                                         <!--    'column_alias': 'booking__host'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                         <!-- where = None -->
+                                        <!-- distinct = False -->
                                         <SqlTableFromClauseNode>
                                             <!-- description = Read from ***************************.fct_bookings -->
                                             <!-- node_id = tfc_10001 -->
@@ -927,6 +936,7 @@
                                 <!--    'column_alias': 'country_latest'}                      -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
                                     <!-- node_id = ss_9 -->
@@ -1200,6 +1210,7 @@
                                     <!--    'column_alias': 'smallest_listing'}                    -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlSelectStatementNode>
                                         <!-- description = Read Elements From Semantic Model 'listings_latest' -->
                                         <!-- node_id = ss_10004 -->
@@ -1429,6 +1440,7 @@
                                         <!--    'column_alias': 'listing__user'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                                         <!-- where = None -->
+                                        <!-- distinct = False -->
                                         <SqlTableFromClauseNode>
                                             <!-- description = Read from ***************************.dim_listings_latest -->
                                             <!-- node_id = tfc_10004 -->
@@ -1458,6 +1470,7 @@
                 <!--    'column_alias': 'views'}                               -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_21) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_21 -->
@@ -1483,6 +1496,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
                     <!--    'column_alias': 'listing__country_latest'}             -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                                        -->
                         <!--   Pass Only Elements:                                -->
@@ -1502,6 +1516,7 @@
                         <!--    'column_alias': 'views'}                               -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_19) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Join Standard Outputs -->
                             <!-- node_id = ss_19 -->
@@ -1529,6 +1544,7 @@
                             <!--    'join_type': SqlJoinType.LEFT_OUTER,                     -->
                             <!--    'on_condition': SqlComparisonExpression(node_id=cmp_1)}  -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description =                        -->
                                 <!--   Pass Only Elements:                -->
@@ -1548,6 +1564,7 @@
                                 <!--    'column_alias': 'views'}                               -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
                                     <!-- node_id = ss_15 -->
@@ -1793,6 +1810,7 @@
                                     <!--    'column_alias': 'views'}                               -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10009) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlSelectStatementNode>
                                         <!-- description = Read Elements From Semantic Model 'views_source' -->
                                         <!-- node_id = ss_10009 -->
@@ -1994,6 +2012,7 @@
                                         <!--    'column_alias': 'view__user'}                            -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10009) -->
                                         <!-- where = None -->
+                                        <!-- distinct = False -->
                                         <SqlTableFromClauseNode>
                                             <!-- description = Read from ***************************.fct_views -->
                                             <!-- node_id = tfc_10009 -->
@@ -2017,6 +2036,7 @@
                                 <!--    'column_alias': 'country_latest'}                      -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
                                     <!-- node_id = ss_17 -->
@@ -2290,6 +2310,7 @@
                                     <!--    'column_alias': 'smallest_listing'}                    -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlSelectStatementNode>
                                         <!-- description = Read Elements From Semantic Model 'listings_latest' -->
                                         <!-- node_id = ss_10004 -->
@@ -2519,6 +2540,7 @@
                                         <!--    'column_alias': 'listing__user'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                                         <!-- where = None -->
+                                        <!-- distinct = False -->
                                         <SqlTableFromClauseNode>
                                             <!-- description = Read from ***************************.dim_listings_latest -->
                                             <!-- node_id = tfc_10004 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml
index 673a308906..b8ea0e4a87 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml
@@ -16,6 +16,7 @@
         <!--    'column_alias': 'bookings_per_booker'}                -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_3) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_3 -->
@@ -45,6 +46,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_13),  -->
             <!--    'column_alias': 'listing__country_latest'}            -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Join Standard Outputs -->
                 <!-- node_id = ss_2 -->
@@ -72,6 +74,7 @@
                 <!--    'join_type': SqlJoinType.LEFT_OUTER,                     -->
                 <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =                           -->
                     <!--   Pass Only Elements:                   -->
@@ -91,6 +94,7 @@
                     <!--    'column_alias': 'bookers'}                           -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                         <!-- node_id = ss_10001 -->
@@ -448,6 +452,7 @@
                         <!--    'column_alias': 'booking__host'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlTableFromClauseNode>
                             <!-- description = Read from ***************************.fct_bookings -->
                             <!-- node_id = tfc_10001 -->
@@ -470,6 +475,7 @@
                     <!--    'column_alias': 'country_latest'}                    -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Read Elements From Semantic Model 'listings_latest' -->
                         <!-- node_id = ss_10004 -->
@@ -699,6 +705,7 @@
                         <!--    'column_alias': 'listing__user'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlTableFromClauseNode>
                             <!-- description = Read from ***************************.dim_listings_latest -->
                             <!-- node_id = tfc_10004 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_simple_expr__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_simple_expr__plan0.xml
index 26438e6ad2..d54260dadb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_simple_expr__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_simple_expr__plan0.xml
@@ -16,6 +16,7 @@
         <!--    'column_alias': 'booking_fees'}                                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_3) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_3 -->
@@ -41,6 +42,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10),  -->
             <!--    'column_alias': 'listing__country_latest'}            -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Join Standard Outputs -->
                 <!-- node_id = ss_2 -->
@@ -64,6 +66,7 @@
                 <!--    'join_type': SqlJoinType.LEFT_OUTER,                     -->
                 <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =                     -->
                     <!--   Pass Only Elements:             -->
@@ -79,6 +82,7 @@
                     <!--    'column_alias': 'booking_value'}                     -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                         <!-- node_id = ss_10001 -->
@@ -436,6 +440,7 @@
                         <!--    'column_alias': 'booking__host'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlTableFromClauseNode>
                             <!-- description = Read from ***************************.fct_bookings -->
                             <!-- node_id = tfc_10001 -->
@@ -458,6 +463,7 @@
                     <!--    'column_alias': 'country_latest'}                    -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Read Elements From Semantic Model 'listings_latest' -->
                         <!-- node_id = ss_10004 -->
@@ -687,6 +693,7 @@
                         <!--    'column_alias': 'listing__user'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlTableFromClauseNode>
                             <!-- description = Read from ***************************.dim_listings_latest -->
                             <!-- node_id = tfc_10004 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_constrain_time_range_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_constrain_time_range_node__plan0.xml
index f502fba68f..2b515cea56 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_constrain_time_range_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_constrain_time_range_node__plan0.xml
@@ -17,6 +17,7 @@
         <!--    'column_alias': 'bookings'}                          -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_1) -->
         <!-- where = SqlBetweenExpression(node_id=betw_0) -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Metric Time Dimension 'ds' -->
             <!-- node_id = ss_1 -->
@@ -34,6 +35,7 @@
             <!--    'column_alias': 'bookings'}                          -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_0) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description =                -->
                 <!--   Pass Only Elements:        -->
@@ -49,6 +51,7 @@
                 <!--    'column_alias': 'bookings'}                          -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                     <!-- node_id = ss_10001 -->
@@ -406,6 +409,7 @@
                     <!--    'column_alias': 'booking__host'}                         -->
                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlTableFromClauseNode>
                         <!-- description = Read from ***************************.fct_bookings -->
                         <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml
index 7e2773e0af..a6d7bb1bb6 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'trailing_2_months_revenue'}           -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_9 -->
@@ -29,6 +30,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description =                     -->
                 <!--   Pass Only Elements:             -->
@@ -44,6 +46,7 @@
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Metric Time Dimension 'ds' -->
                     <!-- node_id = ss_7 -->
@@ -193,6 +196,7 @@
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Read Elements From Semantic Model 'revenue' -->
                         <!-- node_id = ss_10006 -->
@@ -298,6 +302,7 @@
                         <!--    'column_alias': 'company__user'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlTableFromClauseNode>
                             <!-- description = Read from ***************************.fct_revenue -->
                             <!-- node_id = tfc_10006 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml
index 9e80834f37..913dfaf441 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'revenue_mtd'}                         -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_9 -->
@@ -29,6 +30,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description =                     -->
                 <!--   Pass Only Elements:             -->
@@ -44,6 +46,7 @@
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Metric Time Dimension 'ds' -->
                     <!-- node_id = ss_7 -->
@@ -193,6 +196,7 @@
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Read Elements From Semantic Model 'revenue' -->
                         <!-- node_id = ss_10006 -->
@@ -298,6 +302,7 @@
                         <!--    'column_alias': 'company__user'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlTableFromClauseNode>
                             <!-- description = Read from ***************************.fct_revenue -->
                             <!-- node_id = tfc_10006 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml
index ef67de0f3d..00c36f719e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml
@@ -8,6 +8,7 @@
         <!--    'column_alias': 'trailing_2_months_revenue'}           -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_9 -->
@@ -17,6 +18,7 @@
             <!--    'column_alias': 'txn_revenue'}                                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description =          -->
                 <!--   Pass Only Elements:  -->
@@ -28,6 +30,7 @@
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Metric Time Dimension 'ds' -->
                     <!-- node_id = ss_7 -->
@@ -177,6 +180,7 @@
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Read Elements From Semantic Model 'revenue' -->
                         <!-- node_id = ss_10006 -->
@@ -282,6 +286,7 @@
                         <!--    'column_alias': 'company__user'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlTableFromClauseNode>
                             <!-- description = Read from ***************************.fct_revenue -->
                             <!-- node_id = tfc_10006 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml
index beaa84dd6d..b9f64395ce 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'revenue_all_time'}                    -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_9 -->
@@ -29,6 +30,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description =                     -->
                 <!--   Pass Only Elements:             -->
@@ -44,6 +46,7 @@
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Metric Time Dimension 'ds' -->
                     <!-- node_id = ss_7 -->
@@ -193,6 +196,7 @@
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Read Elements From Semantic Model 'revenue' -->
                         <!-- node_id = ss_10006 -->
@@ -298,6 +302,7 @@
                         <!--    'column_alias': 'company__user'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlTableFromClauseNode>
                             <!-- description = Read from ***************************.fct_revenue -->
                             <!-- node_id = tfc_10006 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml
index 326f716361..bf08175608 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'revenue_all_time'}                    -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_12 -->
@@ -29,6 +30,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description =                     -->
                 <!--   Pass Only Elements:             -->
@@ -44,6 +46,7 @@
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =                                                         -->
                     <!--   Constrain Time Range to [2000-01-01T00:00:00, 2020-01-01T00:00:00]  -->
@@ -194,6 +197,7 @@
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                     <!-- where = SqlBetweenExpression(node_id=betw_1) -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Metric Time Dimension 'ds' -->
                         <!-- node_id = ss_9 -->
@@ -343,6 +347,7 @@
                         <!--    'column_alias': 'txn_revenue'}                         -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Read Elements From Semantic Model 'revenue' -->
                             <!-- node_id = ss_10006 -->
@@ -448,6 +453,7 @@
                             <!--    'column_alias': 'company__user'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlTableFromClauseNode>
                                 <!-- description = Read from ***************************.fct_revenue -->
                                 <!-- node_id = tfc_10006 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml
index 445b8866af..abfff45dfb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'trailing_2_months_revenue'}           -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_12 -->
@@ -29,6 +30,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description =                     -->
                 <!--   Pass Only Elements:             -->
@@ -44,6 +46,7 @@
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =                                                         -->
                     <!--   Constrain Time Range to [2019-12-01T00:00:00, 2020-01-01T00:00:00]  -->
@@ -194,6 +197,7 @@
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                     <!-- where = SqlBetweenExpression(node_id=betw_1) -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Metric Time Dimension 'ds' -->
                         <!-- node_id = ss_9 -->
@@ -343,6 +347,7 @@
                         <!--    'column_alias': 'txn_revenue'}                         -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Read Elements From Semantic Model 'revenue' -->
                             <!-- node_id = ss_10006 -->
@@ -448,6 +453,7 @@
                             <!--    'column_alias': 'company__user'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlTableFromClauseNode>
                                 <!-- description = Read from ***************************.fct_revenue -->
                                 <!-- node_id = tfc_10006 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric__plan0.xml
index e9a60a425b..0ca4c8ffbc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'non_referred_bookings_pct'}                                                     -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Combine Metrics -->
             <!-- node_id = ss_15 -->
@@ -35,6 +36,7 @@
             <!--    'join_type': SqlJoinType.INNER,                         -->
             <!--    'on_condition': SqlLogicalExpression(node_id=lo_1)}     -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Compute Metrics via Expressions -->
                 <!-- node_id = ss_10 -->
@@ -48,6 +50,7 @@
                 <!--    'column_alias': 'ref_bookings'}                        -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_9 -->
@@ -65,6 +68,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                                  -->
                         <!--   Pass Only Elements:                          -->
@@ -80,6 +84,7 @@
                         <!--    'column_alias': 'referred_bookings'}                   -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_7 -->
@@ -477,6 +482,7 @@
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                 <!-- node_id = ss_10001 -->
@@ -834,6 +840,7 @@
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.fct_bookings -->
                                     <!-- node_id = tfc_10001 -->
@@ -857,6 +864,7 @@
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_13 -->
@@ -874,6 +882,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                         -->
                         <!--   Pass Only Elements:                 -->
@@ -889,6 +898,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_11 -->
@@ -1286,6 +1296,7 @@
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                 <!-- node_id = ss_10001 -->
@@ -1643,6 +1654,7 @@
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.fct_bookings -->
                                     <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain__plan0.xml
index fe0b52659f..aa8496ef57 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'bookings_growth_since_start_of_month'}                                     -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Combine Metrics -->
             <!-- node_id = ss_17 -->
@@ -35,6 +36,7 @@
             <!--    'join_type': SqlJoinType.INNER,                         -->
             <!--    'on_condition': SqlLogicalExpression(node_id=lo_1)}     -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Compute Metrics via Expressions -->
                 <!-- node_id = ss_10 -->
@@ -48,6 +50,7 @@
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_9 -->
@@ -65,6 +68,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                         -->
                         <!--   Pass Only Elements:                 -->
@@ -80,6 +84,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_7 -->
@@ -477,6 +482,7 @@
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                 <!-- node_id = ss_10001 -->
@@ -834,6 +840,7 @@
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.fct_bookings -->
                                     <!-- node_id = tfc_10001 -->
@@ -857,6 +864,7 @@
                 <!--    'column_alias': 'bookings_at_start_of_month'}          -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_15 -->
@@ -874,6 +882,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                         -->
                         <!--   Pass Only Elements:                 -->
@@ -889,6 +898,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Join to Time Spine Dataset -->
                             <!-- node_id = ss_13 -->
@@ -1252,6 +1262,7 @@
                             <!--    'join_type': SqlJoinType.INNER,                          -->
                             <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Date Spine -->
                                 <!-- node_id = ss_12 -->
@@ -1261,6 +1272,7 @@
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.mf_time_spine -->
                                     <!-- node_id = tfc_0 -->
@@ -1664,6 +1676,7 @@
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                     <!-- node_id = ss_10001 -->
@@ -2021,6 +2034,7 @@
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlTableFromClauseNode>
                                         <!-- description = Read from ***************************.fct_bookings -->
                                         <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain_and_granularity__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain_and_granularity__plan0.xml
index f66b82261c..f60d4b2a1f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain_and_granularity__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain_and_granularity__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'bookings_growth_since_start_of_month'}                                     -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Combine Metrics -->
             <!-- node_id = ss_17 -->
@@ -35,6 +36,7 @@
             <!--    'join_type': SqlJoinType.INNER,                         -->
             <!--    'on_condition': SqlLogicalExpression(node_id=lo_1)}     -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Compute Metrics via Expressions -->
                 <!-- node_id = ss_10 -->
@@ -48,6 +50,7 @@
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_9 -->
@@ -65,6 +68,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                     <!--    'column_alias': 'metric_time__week'}                   -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                          -->
                         <!--   Pass Only Elements:                  -->
@@ -80,6 +84,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_7 -->
@@ -477,6 +482,7 @@
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                 <!-- node_id = ss_10001 -->
@@ -834,6 +840,7 @@
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.fct_bookings -->
                                     <!-- node_id = tfc_10001 -->
@@ -857,6 +864,7 @@
                 <!--    'column_alias': 'bookings_at_start_of_month'}          -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_15 -->
@@ -874,6 +882,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                     <!--    'column_alias': 'metric_time__week'}                   -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                          -->
                         <!--   Pass Only Elements:                  -->
@@ -889,6 +898,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Join to Time Spine Dataset -->
                             <!-- node_id = ss_13 -->
@@ -1252,6 +1262,7 @@
                             <!--    'join_type': SqlJoinType.INNER,                          -->
                             <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
                             <!-- where = SqlComparisonExpression(node_id=cmp_1) -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Date Spine -->
                                 <!-- node_id = ss_12 -->
@@ -1261,6 +1272,7 @@
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.mf_time_spine -->
                                     <!-- node_id = tfc_0 -->
@@ -1664,6 +1676,7 @@
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                     <!-- node_id = ss_10001 -->
@@ -2021,6 +2034,7 @@
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlTableFromClauseNode>
                                         <!-- description = Read from ***************************.fct_bookings -->
                                         <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window__plan0.xml
index 5a2df47005..3da4faee6d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'bookings_growth_2_weeks'}                                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Combine Metrics -->
             <!-- node_id = ss_17 -->
@@ -35,6 +36,7 @@
             <!--    'join_type': SqlJoinType.INNER,                         -->
             <!--    'on_condition': SqlLogicalExpression(node_id=lo_1)}     -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Compute Metrics via Expressions -->
                 <!-- node_id = ss_10 -->
@@ -48,6 +50,7 @@
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_9 -->
@@ -65,6 +68,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                         -->
                         <!--   Pass Only Elements:                 -->
@@ -80,6 +84,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_7 -->
@@ -477,6 +482,7 @@
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                 <!-- node_id = ss_10001 -->
@@ -834,6 +840,7 @@
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.fct_bookings -->
                                     <!-- node_id = tfc_10001 -->
@@ -857,6 +864,7 @@
                 <!--    'column_alias': 'bookings_2_weeks_ago'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_15 -->
@@ -874,6 +882,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                         -->
                         <!--   Pass Only Elements:                 -->
@@ -889,6 +898,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Join to Time Spine Dataset -->
                             <!-- node_id = ss_13 -->
@@ -1252,6 +1262,7 @@
                             <!--    'join_type': SqlJoinType.INNER,                          -->
                             <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Date Spine -->
                                 <!-- node_id = ss_12 -->
@@ -1261,6 +1272,7 @@
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.mf_time_spine -->
                                     <!-- node_id = tfc_0 -->
@@ -1664,6 +1676,7 @@
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                     <!-- node_id = ss_10001 -->
@@ -2021,6 +2034,7 @@
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlTableFromClauseNode>
                                         <!-- description = Read from ***************************.fct_bookings -->
                                         <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_granularity__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_granularity__plan0.xml
index d44ef8f9cb..5da7d0615a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_granularity__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_granularity__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'bookings_growth_2_weeks'}                                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Combine Metrics -->
             <!-- node_id = ss_17 -->
@@ -35,6 +36,7 @@
             <!--    'join_type': SqlJoinType.INNER,                         -->
             <!--    'on_condition': SqlLogicalExpression(node_id=lo_1)}     -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Compute Metrics via Expressions -->
                 <!-- node_id = ss_10 -->
@@ -48,6 +50,7 @@
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_9 -->
@@ -65,6 +68,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                     <!--    'column_alias': 'metric_time__quarter'}                -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                             -->
                         <!--   Pass Only Elements:                     -->
@@ -80,6 +84,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_7 -->
@@ -477,6 +482,7 @@
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                 <!-- node_id = ss_10001 -->
@@ -834,6 +840,7 @@
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.fct_bookings -->
                                     <!-- node_id = tfc_10001 -->
@@ -857,6 +864,7 @@
                 <!--    'column_alias': 'bookings_2_weeks_ago'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_15 -->
@@ -874,6 +882,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                     <!--    'column_alias': 'metric_time__quarter'}                -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                             -->
                         <!--   Pass Only Elements:                     -->
@@ -889,6 +898,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Join to Time Spine Dataset -->
                             <!-- node_id = ss_13 -->
@@ -1252,6 +1262,7 @@
                             <!--    'join_type': SqlJoinType.INNER,                          -->
                             <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Date Spine -->
                                 <!-- node_id = ss_12 -->
@@ -1261,6 +1272,7 @@
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.mf_time_spine -->
                                     <!-- node_id = tfc_0 -->
@@ -1664,6 +1676,7 @@
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                     <!-- node_id = ss_10001 -->
@@ -2021,6 +2034,7 @@
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlTableFromClauseNode>
                                         <!-- description = Read from ***************************.fct_bookings -->
                                         <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.xml
index c3b6719455..7c856cd1b0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'bookings_month_start_compared_to_1_month_prior'}                                 -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_19) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Combine Metrics -->
             <!-- node_id = ss_19 -->
@@ -35,6 +36,7 @@
             <!--    'join_type': SqlJoinType.INNER,                         -->
             <!--    'on_condition': SqlLogicalExpression(node_id=lo_1)}     -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Compute Metrics via Expressions -->
                 <!-- node_id = ss_12 -->
@@ -48,6 +50,7 @@
                 <!--    'column_alias': 'month_start_bookings'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_11 -->
@@ -65,6 +68,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                         -->
                         <!--   Pass Only Elements:                 -->
@@ -80,6 +84,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Join to Time Spine Dataset -->
                             <!-- node_id = ss_9 -->
@@ -443,6 +448,7 @@
                             <!--    'join_type': SqlJoinType.INNER,                          -->
                             <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Date Spine -->
                                 <!-- node_id = ss_8 -->
@@ -452,6 +458,7 @@
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.mf_time_spine -->
                                     <!-- node_id = tfc_0 -->
@@ -855,6 +862,7 @@
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                     <!-- node_id = ss_10001 -->
@@ -1212,6 +1220,7 @@
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlTableFromClauseNode>
                                         <!-- description = Read from ***************************.fct_bookings -->
                                         <!-- node_id = tfc_10001 -->
@@ -1236,6 +1245,7 @@
                 <!--    'column_alias': 'bookings_1_month_ago'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_17 -->
@@ -1253,6 +1263,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                         -->
                         <!--   Pass Only Elements:                 -->
@@ -1268,6 +1279,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Join to Time Spine Dataset -->
                             <!-- node_id = ss_15 -->
@@ -1631,6 +1643,7 @@
                             <!--    'join_type': SqlJoinType.INNER,                          -->
                             <!--    'on_condition': SqlComparisonExpression(node_id=cmp_1)}  -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Date Spine -->
                                 <!-- node_id = ss_14 -->
@@ -1640,6 +1653,7 @@
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_1) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.mf_time_spine -->
                                     <!-- node_id = tfc_1 -->
@@ -2043,6 +2057,7 @@
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                     <!-- node_id = ss_10001 -->
@@ -2400,6 +2415,7 @@
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlTableFromClauseNode>
                                         <!-- description = Read from ***************************.fct_bookings -->
                                         <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.xml
index 5ac2cd2626..6f38c1d56b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'bookings_month_start_compared_to_1_month_prior'}                                 -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_19) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Combine Metrics -->
             <!-- node_id = ss_19 -->
@@ -35,6 +36,7 @@
             <!--    'join_type': SqlJoinType.INNER,                         -->
             <!--    'on_condition': SqlLogicalExpression(node_id=lo_1)}     -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Compute Metrics via Expressions -->
                 <!-- node_id = ss_12 -->
@@ -48,6 +50,7 @@
                 <!--    'column_alias': 'month_start_bookings'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_11 -->
@@ -65,6 +68,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                     <!--    'column_alias': 'metric_time__year'}                   -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                          -->
                         <!--   Pass Only Elements:                  -->
@@ -80,6 +84,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Join to Time Spine Dataset -->
                             <!-- node_id = ss_9 -->
@@ -443,6 +448,7 @@
                             <!--    'join_type': SqlJoinType.INNER,                          -->
                             <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
                             <!-- where = SqlComparisonExpression(node_id=cmp_1) -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Date Spine -->
                                 <!-- node_id = ss_8 -->
@@ -452,6 +458,7 @@
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.mf_time_spine -->
                                     <!-- node_id = tfc_0 -->
@@ -855,6 +862,7 @@
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                     <!-- node_id = ss_10001 -->
@@ -1212,6 +1220,7 @@
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlTableFromClauseNode>
                                         <!-- description = Read from ***************************.fct_bookings -->
                                         <!-- node_id = tfc_10001 -->
@@ -1236,6 +1245,7 @@
                 <!--    'column_alias': 'bookings_1_month_ago'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_17 -->
@@ -1253,6 +1263,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
                     <!--    'column_alias': 'metric_time__year'}                   -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                          -->
                         <!--   Pass Only Elements:                  -->
@@ -1268,6 +1279,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Join to Time Spine Dataset -->
                             <!-- node_id = ss_15 -->
@@ -1631,6 +1643,7 @@
                             <!--    'join_type': SqlJoinType.INNER,                          -->
                             <!--    'on_condition': SqlComparisonExpression(node_id=cmp_2)}  -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Date Spine -->
                                 <!-- node_id = ss_14 -->
@@ -1640,6 +1653,7 @@
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_1) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.mf_time_spine -->
                                     <!-- node_id = tfc_1 -->
@@ -2043,6 +2057,7 @@
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                     <!-- node_id = ss_10001 -->
@@ -2400,6 +2415,7 @@
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlTableFromClauseNode>
                                         <!-- description = Read from ***************************.fct_bookings -->
                                         <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_cumulative_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_cumulative_metric__plan0.xml
index 7be63b55c7..e738aa5011 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_cumulative_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_cumulative_metric__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'every_2_days_bookers_2_days_ago'}                                    -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Compute Metrics via Expressions -->
             <!-- node_id = ss_14 -->
@@ -25,6 +26,7 @@
             <!--    'column_alias': 'every_2_days_bookers_2_days_ago'}     -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = ss_13 -->
@@ -42,6 +44,7 @@
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =                        -->
                     <!--   Pass Only Elements:                -->
@@ -57,6 +60,7 @@
                     <!--    'column_alias': 'bookers'}                             -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Join to Time Spine Dataset -->
                         <!-- node_id = ss_11 -->
@@ -420,6 +424,7 @@
                         <!--    'join_type': SqlJoinType.INNER,                          -->
                         <!--    'on_condition': SqlComparisonExpression(node_id=cmp_2)}  -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Date Spine -->
                             <!-- node_id = ss_10 -->
@@ -429,6 +434,7 @@
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_1) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlTableFromClauseNode>
                                 <!-- description = Read from ***************************.mf_time_spine -->
                                 <!-- node_id = tfc_1 -->
@@ -838,6 +844,7 @@
                             <!--    'join_type': SqlJoinType.INNER,                        -->
                             <!--    'on_condition': SqlLogicalExpression(node_id=lo_0)}    -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Date Spine -->
                                 <!-- node_id = ss_8 -->
@@ -847,6 +854,7 @@
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.mf_time_spine -->
                                     <!-- node_id = tfc_0 -->
@@ -1250,6 +1258,7 @@
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                     <!-- node_id = ss_10001 -->
@@ -1607,6 +1616,7 @@
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlTableFromClauseNode>
                                         <!-- description = Read from ***************************.fct_bookings -->
                                         <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_metric_with_one_input_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_metric_with_one_input_metric__plan0.xml
index 2fd0f98994..5976ecdcf7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_metric_with_one_input_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_metric_with_one_input_metric__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'bookings_5_day_lag'}                                     -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Compute Metrics via Expressions -->
             <!-- node_id = ss_12 -->
@@ -25,6 +26,7 @@
             <!--    'column_alias': 'bookings_5_days_ago'}                 -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = ss_11 -->
@@ -42,6 +44,7 @@
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =                         -->
                     <!--   Pass Only Elements:                 -->
@@ -57,6 +60,7 @@
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Join to Time Spine Dataset -->
                         <!-- node_id = ss_9 -->
@@ -420,6 +424,7 @@
                         <!--    'join_type': SqlJoinType.INNER,                          -->
                         <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Date Spine -->
                             <!-- node_id = ss_8 -->
@@ -429,6 +434,7 @@
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlTableFromClauseNode>
                                 <!-- description = Read from ***************************.mf_time_spine -->
                                 <!-- node_id = tfc_0 -->
@@ -832,6 +838,7 @@
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                 <!-- node_id = ss_10001 -->
@@ -1189,6 +1196,7 @@
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.fct_bookings -->
                                     <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_distinct_values__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_distinct_values__plan0.xml
index 51d9c8856c..80038d697d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_distinct_values__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_distinct_values__plan0.xml
@@ -12,6 +12,7 @@
         <!--   {'class': 'SqlOrderByDescription',                     -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_57),  -->
         <!--    'desc': True}                                         -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description =                    -->
             <!--   Pass Only Elements:            -->
@@ -27,6 +28,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_56),  -->
             <!--    'column_alias': 'listing__country_latest'}            -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Constrain Output with WHERE -->
                 <!-- node_id = ss_0 -->
@@ -257,6 +259,7 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                 <!-- where =                                                                       -->
                 <!--   SqlStringExpression(node_id=str_0 sql_expr=listing__country_latest = 'us')  -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Read Elements From Semantic Model 'listings_latest' -->
                     <!-- node_id = ss_10004 -->
@@ -486,6 +489,7 @@
                     <!--    'column_alias': 'listing__user'}                         -->
                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlTableFromClauseNode>
                         <!-- description = Read from ***************************.dim_listings_latest -->
                         <!-- node_id = tfc_10004 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_node__plan0.xml
index 507d162fbc..43d205cc89 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_node__plan0.xml
@@ -10,6 +10,7 @@
         <!--    'column_alias': 'bookings'}                          -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Read Elements From Semantic Model 'bookings_source' -->
             <!-- node_id = ss_10001 -->
@@ -367,6 +368,7 @@
             <!--    'column_alias': 'booking__host'}                         -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlTableFromClauseNode>
                 <!-- description = Read from ***************************.fct_bookings -->
                 <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_node__plan0.xml
index 4ca58fa593..031d207292 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_node__plan0.xml
@@ -13,6 +13,7 @@
         <!-- from_source = SqlSelectStatementNode(node_id=ss_0) -->
         <!-- where =                                                                        -->
         <!--   SqlStringExpression(node_id=str_0 sql_expr=booking__ds__day = '2020-01-01')  -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description =                -->
             <!--   Pass Only Elements:        -->
@@ -28,6 +29,7 @@
             <!--    'column_alias': 'bookings'}                          -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                 <!-- node_id = ss_10001 -->
@@ -385,6 +387,7 @@
                 <!--    'column_alias': 'booking__host'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlTableFromClauseNode>
                     <!-- description = Read from ***************************.fct_bookings -->
                     <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_on_join_dim__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_on_join_dim__plan0.xml
index b8b50e9330..e83eef1488 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_on_join_dim__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_on_join_dim__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'bookings'}                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_15 -->
@@ -29,6 +30,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
             <!--    'column_alias': 'is_instant'}                          -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description =                   -->
                 <!--   Pass Only Elements:           -->
@@ -44,6 +46,7 @@
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Constrain Output with WHERE -->
                     <!-- node_id = ss_13 -->
@@ -62,6 +65,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                     <!-- where =                                                                       -->
                     <!--   SqlStringExpression(node_id=str_0 sql_expr=listing__country_latest = 'us')  -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                                              -->
                         <!--   Pass Only Elements:                                      -->
@@ -81,6 +85,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Join Standard Outputs -->
                             <!-- node_id = ss_11 -->
@@ -108,6 +113,7 @@
                             <!--    'join_type': SqlJoinType.LEFT_OUTER,                     -->
                             <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description =                              -->
                                 <!--   Pass Only Elements:                      -->
@@ -127,6 +133,7 @@
                                 <!--    'column_alias': 'bookings'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
                                     <!-- node_id = ss_7 -->
@@ -524,6 +531,7 @@
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlSelectStatementNode>
                                         <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                         <!-- node_id = ss_10001 -->
@@ -881,6 +889,7 @@
                                         <!--    'column_alias': 'booking__host'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                         <!-- where = None -->
+                                        <!-- distinct = False -->
                                         <SqlTableFromClauseNode>
                                             <!-- description = Read from ***************************.fct_bookings -->
                                             <!-- node_id = tfc_10001 -->
@@ -904,6 +913,7 @@
                                 <!--    'column_alias': 'country_latest'}                      -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
                                     <!-- node_id = ss_9 -->
@@ -1177,6 +1187,7 @@
                                     <!--    'column_alias': 'smallest_listing'}                    -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlSelectStatementNode>
                                         <!-- description = Read Elements From Semantic Model 'listings_latest' -->
                                         <!-- node_id = ss_10004 -->
@@ -1406,6 +1417,7 @@
                                         <!--    'column_alias': 'listing__user'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                                         <!-- where = None -->
+                                        <!-- distinct = False -->
                                         <SqlTableFromClauseNode>
                                             <!-- description = Read from ***************************.dim_listings_latest -->
                                             <!-- node_id = tfc_10004 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml
index bd5c867143..1bb6954e59 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'family_bookings'}                     -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_9 -->
@@ -29,6 +30,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description =                         -->
                 <!--   Pass Only Elements:                 -->
@@ -44,6 +46,7 @@
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Constrain Output with WHERE -->
                     <!-- node_id = ss_7 -->
@@ -62,6 +65,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_6) -->
                     <!-- where =                                                              -->
                     <!--   SqlStringExpression(node_id=str_0 sql_expr=listing__capacity > 2)  -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                                              -->
                         <!--   Pass Only Elements:                                      -->
@@ -81,6 +85,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_5) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Join Standard Outputs -->
                             <!-- node_id = ss_5 -->
@@ -116,6 +121,7 @@
                             <!--    'join_type': SqlJoinType.LEFT_OUTER,                   -->
                             <!--    'on_condition': SqlLogicalExpression(node_id=lo_2)}    -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description =                                    -->
                                 <!--   Pass Only Elements:                            -->
@@ -135,6 +141,7 @@
                                 <!--    'column_alias': 'bookings'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_2) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
                                     <!-- node_id = ss_2 -->
@@ -508,6 +515,7 @@
                                     <!--    'column_alias': 'average_booking_value'}               -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10015) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlSelectStatementNode>
                                         <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                         <!-- node_id = ss_10015 -->
@@ -841,6 +849,7 @@
                                         <!--    'column_alias': 'booking__user'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10015) -->
                                         <!-- where = None -->
+                                        <!-- distinct = False -->
                                         <SqlTableFromClauseNode>
                                             <!-- description = Read from ***************************.fct_bookings -->
                                             <!-- node_id = tfc_10015 -->
@@ -872,6 +881,7 @@
                                 <!--    'column_alias': 'capacity'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10017) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Read Elements From Semantic Model 'listings' -->
                                     <!-- node_id = ss_10017 -->
@@ -1089,6 +1099,7 @@
                                     <!--    'column_alias': 'listing__user'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10017) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlTableFromClauseNode>
                                         <!-- description = Read from ***************************.dim_listings -->
                                         <!-- node_id = tfc_10017 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
index da4b9f2c53..f15986b92a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
@@ -22,6 +22,7 @@
         <!--    'join_type': SqlJoinType.INNER,                          -->
         <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Date Spine -->
             <!-- node_id = ss_4 -->
@@ -31,6 +32,7 @@
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
             <!-- where = SqlBetweenExpression(node_id=betw_0) -->
+            <!-- distinct = False -->
             <SqlTableFromClauseNode>
                 <!-- description = Read from ***************************.mf_time_spine -->
                 <!-- node_id = tfc_0 -->
@@ -54,6 +56,7 @@
             <!--    'column_alias': 'booking_fees'}                                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_2) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = ss_2 -->
@@ -79,6 +82,7 @@
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
                 <!--    'column_alias': 'listing'}                             -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =                                         -->
                     <!--   Pass Only Elements:                                 -->
@@ -98,6 +102,7 @@
                     <!--    'column_alias': 'booking_value'}                      -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_0) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Metric Time Dimension 'ds' -->
                         <!-- node_id = ss_0 -->
@@ -495,6 +500,7 @@
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                             <!-- node_id = ss_10001 -->
@@ -852,6 +858,7 @@
                             <!--    'column_alias': 'booking__host'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlTableFromClauseNode>
                                 <!-- description = Read from ***************************.fct_bookings -->
                                 <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
index da4b9f2c53..f15986b92a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
@@ -22,6 +22,7 @@
         <!--    'join_type': SqlJoinType.INNER,                          -->
         <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Date Spine -->
             <!-- node_id = ss_4 -->
@@ -31,6 +32,7 @@
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
             <!-- where = SqlBetweenExpression(node_id=betw_0) -->
+            <!-- distinct = False -->
             <SqlTableFromClauseNode>
                 <!-- description = Read from ***************************.mf_time_spine -->
                 <!-- node_id = tfc_0 -->
@@ -54,6 +56,7 @@
             <!--    'column_alias': 'booking_fees'}                                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_2) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = ss_2 -->
@@ -79,6 +82,7 @@
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
                 <!--    'column_alias': 'listing'}                             -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =                                         -->
                     <!--   Pass Only Elements:                                 -->
@@ -98,6 +102,7 @@
                     <!--    'column_alias': 'booking_value'}                      -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_0) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Metric Time Dimension 'ds' -->
                         <!-- node_id = ss_0 -->
@@ -495,6 +500,7 @@
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                             <!-- node_id = ss_10001 -->
@@ -852,6 +858,7 @@
                             <!--    'column_alias': 'booking__host'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlTableFromClauseNode>
                                 <!-- description = Read from ***************************.fct_bookings -->
                                 <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_without_offset__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_without_offset__plan0.xml
index da4b9f2c53..f15986b92a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_without_offset__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_without_offset__plan0.xml
@@ -22,6 +22,7 @@
         <!--    'join_type': SqlJoinType.INNER,                          -->
         <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Date Spine -->
             <!-- node_id = ss_4 -->
@@ -31,6 +32,7 @@
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
             <!-- where = SqlBetweenExpression(node_id=betw_0) -->
+            <!-- distinct = False -->
             <SqlTableFromClauseNode>
                 <!-- description = Read from ***************************.mf_time_spine -->
                 <!-- node_id = tfc_0 -->
@@ -54,6 +56,7 @@
             <!--    'column_alias': 'booking_fees'}                                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_2) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = ss_2 -->
@@ -79,6 +82,7 @@
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
                 <!--    'column_alias': 'listing'}                             -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =                                         -->
                     <!--   Pass Only Elements:                                 -->
@@ -98,6 +102,7 @@
                     <!--    'column_alias': 'booking_value'}                      -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_0) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Metric Time Dimension 'ds' -->
                         <!-- node_id = ss_0 -->
@@ -495,6 +500,7 @@
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                             <!-- node_id = ss_10001 -->
@@ -852,6 +858,7 @@
                             <!--    'column_alias': 'booking__host'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlTableFromClauseNode>
                                 <!-- description = Read from ***************************.fct_bookings -->
                                 <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_limit_rows__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_limit_rows__plan0.xml
index c5d3c36c1f..9ea56ffb46 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_limit_rows__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_limit_rows__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'bookings'}                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Compute Metrics via Expressions -->
             <!-- node_id = ss_10 -->
@@ -25,6 +26,7 @@
             <!--    'column_alias': 'bookings'}                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = ss_9 -->
@@ -42,6 +44,7 @@
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                 <!--    'column_alias': 'ds__day'}                             -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =                -->
                     <!--   Pass Only Elements:        -->
@@ -57,6 +60,7 @@
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Metric Time Dimension 'ds' -->
                         <!-- node_id = ss_7 -->
@@ -454,6 +458,7 @@
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                             <!-- node_id = ss_10001 -->
@@ -811,6 +816,7 @@
                             <!--    'column_alias': 'booking__host'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlTableFromClauseNode>
                                 <!-- description = Read from ***************************.fct_bookings -->
                                 <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_local_dimension_using_local_entity__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_local_dimension_using_local_entity__plan0.xml
index d5654b3b2f..301b80d47c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_local_dimension_using_local_entity__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_local_dimension_using_local_entity__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'listings'}                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_9 -->
@@ -29,6 +30,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
             <!--    'column_alias': 'listing__country_latest'}             -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description =                                -->
                 <!--   Pass Only Elements:                        -->
@@ -44,6 +46,7 @@
                 <!--    'column_alias': 'listings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Metric Time Dimension 'ds' -->
                     <!-- node_id = ss_7 -->
@@ -317,6 +320,7 @@
                     <!--    'column_alias': 'smallest_listing'}                    -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Read Elements From Semantic Model 'listings_latest' -->
                         <!-- node_id = ss_10004 -->
@@ -546,6 +550,7 @@
                         <!--    'column_alias': 'listing__user'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlTableFromClauseNode>
                             <!-- description = Read from ***************************.dim_listings_latest -->
                             <!-- node_id = tfc_10004 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_aggregation_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_aggregation_node__plan0.xml
index 9040ebdb0c..4d73ee2270 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_aggregation_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_aggregation_node__plan0.xml
@@ -20,6 +20,7 @@
         <!--    'column_alias': 'average_booking_value'}                                      -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_0) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description =                                                             -->
             <!--   Pass Only Elements:                                                     -->
@@ -43,6 +44,7 @@
             <!--    'column_alias': 'average_booking_value'}             -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                 <!-- node_id = ss_10001 -->
@@ -400,6 +402,7 @@
                 <!--    'column_alias': 'booking__host'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlTableFromClauseNode>
                     <!-- description = Read from ***************************.fct_bookings -->
                     <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint__plan0.xml
index fcedb12803..c525704e00 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'lux_booking_value_rate_expr'}                                                                    -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_31) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Combine Metrics -->
             <!-- node_id = ss_31 -->
@@ -45,6 +46,7 @@
             <!--    'join_type': SqlJoinType.INNER,                         -->
             <!--    'on_condition': SqlLogicalExpression(node_id=lo_3)}     -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Compute Metrics via Expressions -->
                 <!-- node_id = ss_16 -->
@@ -58,6 +60,7 @@
                 <!--    'column_alias': 'average_booking_value'}               -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_15 -->
@@ -75,6 +78,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                                      -->
                         <!--   Pass Only Elements:                              -->
@@ -90,6 +94,7 @@
                         <!--    'column_alias': 'average_booking_value'}               -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Constrain Output with WHERE -->
                             <!-- node_id = ss_13 -->
@@ -108,6 +113,7 @@
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                             <!-- where =                                                               -->
                             <!--   SqlStringExpression(node_id=str_0 sql_expr=listing__is_lux_latest)  -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description =                                                                -->
                                 <!--   Pass Only Elements:                                                        -->
@@ -127,6 +133,7 @@
                                 <!--    'column_alias': 'average_booking_value'}               -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Join Standard Outputs -->
                                     <!-- node_id = ss_11 -->
@@ -154,6 +161,7 @@
                                     <!--    'join_type': SqlJoinType.LEFT_OUTER,                     -->
                                     <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlSelectStatementNode>
                                         <!-- description =                                                 -->
                                         <!--   Pass Only Elements:                                         -->
@@ -173,6 +181,7 @@
                                         <!--    'column_alias': 'average_booking_value'}               -->
                                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                                         <!-- where = None -->
+                                        <!-- distinct = False -->
                                         <SqlSelectStatementNode>
                                             <!-- description = Metric Time Dimension 'ds' -->
                                             <!-- node_id = ss_7 -->
@@ -570,6 +579,7 @@
                                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                             <!-- where = None -->
+                                            <!-- distinct = False -->
                                             <SqlSelectStatementNode>
                                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                                 <!-- node_id = ss_10001 -->
@@ -927,6 +937,7 @@
                                                 <!--    'column_alias': 'booking__host'}                         -->
                                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                                 <!-- where = None -->
+                                                <!-- distinct = False -->
                                                 <SqlTableFromClauseNode>
                                                     <!-- description = Read from ***************************.fct_bookings -->
                                                     <!-- node_id = tfc_10001 -->
@@ -950,6 +961,7 @@
                                         <!--    'column_alias': 'is_lux_latest'}                       -->
                                         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                                         <!-- where = None -->
+                                        <!-- distinct = False -->
                                         <SqlSelectStatementNode>
                                             <!-- description = Metric Time Dimension 'ds' -->
                                             <!-- node_id = ss_9 -->
@@ -1223,6 +1235,7 @@
                                             <!--    'column_alias': 'smallest_listing'}                    -->
                                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                                             <!-- where = None -->
+                                            <!-- distinct = False -->
                                             <SqlSelectStatementNode>
                                                 <!-- description = Read Elements From Semantic Model 'listings_latest' -->
                                                 <!-- node_id = ss_10004 -->
@@ -1452,6 +1465,7 @@
                                                 <!--    'column_alias': 'listing__user'}                         -->
                                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                                                 <!-- where = None -->
+                                                <!-- distinct = False -->
                                                 <SqlTableFromClauseNode>
                                                     <!-- description = Read from ***************************.dim_listings_latest -->
                                                     <!-- node_id = tfc_10004 -->
@@ -1479,6 +1493,7 @@
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_25) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_25 -->
@@ -1496,6 +1511,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                         -->
                         <!--   Pass Only Elements:                 -->
@@ -1511,6 +1527,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_23) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Constrain Output with WHERE -->
                             <!-- node_id = ss_23 -->
@@ -1529,6 +1546,7 @@
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_22) -->
                             <!-- where =                                                               -->
                             <!--   SqlStringExpression(node_id=str_1 sql_expr=listing__is_lux_latest)  -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description =                                                   -->
                                 <!--   Pass Only Elements:                                           -->
@@ -1548,6 +1566,7 @@
                                 <!--    'column_alias': 'bookings'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_21) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Join Standard Outputs -->
                                     <!-- node_id = ss_21 -->
@@ -1575,6 +1594,7 @@
                                     <!--    'join_type': SqlJoinType.LEFT_OUTER,                     -->
                                     <!--    'on_condition': SqlComparisonExpression(node_id=cmp_1)}  -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlSelectStatementNode>
                                         <!-- description =                                    -->
                                         <!--   Pass Only Elements:                            -->
@@ -1594,6 +1614,7 @@
                                         <!--    'column_alias': 'bookings'}                            -->
                                         <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                                         <!-- where = None -->
+                                        <!-- distinct = False -->
                                         <SqlSelectStatementNode>
                                             <!-- description = Metric Time Dimension 'ds' -->
                                             <!-- node_id = ss_17 -->
@@ -1991,6 +2012,7 @@
                                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                             <!-- where = None -->
+                                            <!-- distinct = False -->
                                             <SqlSelectStatementNode>
                                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                                 <!-- node_id = ss_10001 -->
@@ -2348,6 +2370,7 @@
                                                 <!--    'column_alias': 'booking__host'}                         -->
                                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                                 <!-- where = None -->
+                                                <!-- distinct = False -->
                                                 <SqlTableFromClauseNode>
                                                     <!-- description = Read from ***************************.fct_bookings -->
                                                     <!-- node_id = tfc_10001 -->
@@ -2371,6 +2394,7 @@
                                         <!--    'column_alias': 'is_lux_latest'}                       -->
                                         <!-- from_source = SqlSelectStatementNode(node_id=ss_19) -->
                                         <!-- where = None -->
+                                        <!-- distinct = False -->
                                         <SqlSelectStatementNode>
                                             <!-- description = Metric Time Dimension 'ds' -->
                                             <!-- node_id = ss_19 -->
@@ -2644,6 +2668,7 @@
                                             <!--    'column_alias': 'smallest_listing'}                    -->
                                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                                             <!-- where = None -->
+                                            <!-- distinct = False -->
                                             <SqlSelectStatementNode>
                                                 <!-- description = Read Elements From Semantic Model 'listings_latest' -->
                                                 <!-- node_id = ss_10004 -->
@@ -2873,6 +2898,7 @@
                                                 <!--    'column_alias': 'listing__user'}                         -->
                                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                                                 <!-- where = None -->
+                                                <!-- distinct = False -->
                                                 <SqlTableFromClauseNode>
                                                     <!-- description = Read from ***************************.dim_listings_latest -->
                                                     <!-- node_id = tfc_10004 -->
@@ -2900,6 +2926,7 @@
                 <!--    'column_alias': 'booking_value'}                       -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_29) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_29 -->
@@ -2917,6 +2944,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_925),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                              -->
                         <!--   Pass Only Elements:                      -->
@@ -2932,6 +2960,7 @@
                         <!--    'column_alias': 'booking_value'}                       -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_27) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_27 -->
@@ -3329,6 +3358,7 @@
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                 <!-- node_id = ss_10001 -->
@@ -3686,6 +3716,7 @@
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.fct_bookings -->
                                     <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_reused_measure__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_reused_measure__plan0.xml
index 936cf53cd2..6d92142cf6 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_reused_measure__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_reused_measure__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'instant_booking_value_ratio'}        -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Combine Metrics -->
             <!-- node_id = ss_17 -->
@@ -35,6 +36,7 @@
             <!--    'join_type': SqlJoinType.INNER,                         -->
             <!--    'on_condition': SqlLogicalExpression(node_id=lo_1)}     -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Compute Metrics via Expressions -->
                 <!-- node_id = ss_12 -->
@@ -48,6 +50,7 @@
                 <!--    'column_alias': 'booking_value_with_is_instant_constraint'}  -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_11 -->
@@ -65,6 +68,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                              -->
                         <!--   Pass Only Elements:                      -->
@@ -80,6 +84,7 @@
                         <!--    'column_alias': 'booking_value'}                       -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Constrain Output with WHERE -->
                             <!-- node_id = ss_9 -->
@@ -98,6 +103,7 @@
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                             <!-- where =                                                            -->
                             <!--   SqlStringExpression(node_id=str_0 sql_expr=booking__is_instant)  -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description =                                                     -->
                                 <!--   Pass Only Elements:                                             -->
@@ -117,6 +123,7 @@
                                 <!--    'column_alias': 'booking_value'}                       -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
                                     <!-- node_id = ss_7 -->
@@ -514,6 +521,7 @@
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlSelectStatementNode>
                                         <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                         <!-- node_id = ss_10001 -->
@@ -871,6 +879,7 @@
                                         <!--    'column_alias': 'booking__host'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                         <!-- where = None -->
+                                        <!-- distinct = False -->
                                         <SqlTableFromClauseNode>
                                             <!-- description = Read from ***************************.fct_bookings -->
                                             <!-- node_id = tfc_10001 -->
@@ -896,6 +905,7 @@
                 <!--    'column_alias': 'booking_value'}                       -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_15 -->
@@ -913,6 +923,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                              -->
                         <!--   Pass Only Elements:                      -->
@@ -928,6 +939,7 @@
                         <!--    'column_alias': 'booking_value'}                       -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_13 -->
@@ -1325,6 +1337,7 @@
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                 <!-- node_id = ss_10001 -->
@@ -1682,6 +1695,7 @@
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.fct_bookings -->
                                     <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_single_expr_and_alias__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_single_expr_and_alias__plan0.xml
index 9448915324..f4b8f7e1e5 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_single_expr_and_alias__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_single_expr_and_alias__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'double_counted_delayed_bookings'}                         -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Compute Metrics via Expressions -->
             <!-- node_id = ss_12 -->
@@ -25,6 +26,7 @@
             <!--    'column_alias': 'delayed_bookings'}                    -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = ss_11 -->
@@ -42,6 +44,7 @@
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =                         -->
                     <!--   Pass Only Elements:                 -->
@@ -57,6 +60,7 @@
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Constrain Output with WHERE -->
                         <!-- node_id = ss_9 -->
@@ -75,6 +79,7 @@
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                         <!-- where =                                                                -->
                         <!--   SqlStringExpression(node_id=str_0 sql_expr=NOT booking__is_instant)  -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description =                                                -->
                             <!--   Pass Only Elements:                                        -->
@@ -94,6 +99,7 @@
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Metric Time Dimension 'ds' -->
                                 <!-- node_id = ss_7 -->
@@ -491,6 +497,7 @@
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                     <!-- node_id = ss_10001 -->
@@ -848,6 +855,7 @@
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlTableFromClauseNode>
                                         <!-- description = Read from ***************************.fct_bookings -->
                                         <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.xml
index 22c76330ac..572130391b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.xml
@@ -8,6 +8,7 @@
         <!--    'column_alias': 'bookings_per_listing'}               -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Combine Metrics -->
             <!-- node_id = ss_15 -->
@@ -27,6 +28,7 @@
             <!--    'join_type': SqlJoinType.CROSS_JOIN,                    -->
             <!--    'on_condition': None}                                   -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Compute Metrics via Expressions -->
                 <!-- node_id = ss_10 -->
@@ -36,6 +38,7 @@
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_9 -->
@@ -45,6 +48,7 @@
                     <!--    'column_alias': 'bookings'}                                               -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =          -->
                         <!--   Pass Only Elements:  -->
@@ -56,6 +60,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_7 -->
@@ -453,6 +458,7 @@
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                 <!-- node_id = ss_10001 -->
@@ -810,6 +816,7 @@
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.fct_bookings -->
                                     <!-- node_id = tfc_10001 -->
@@ -829,6 +836,7 @@
                 <!--    'column_alias': 'listings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_13 -->
@@ -838,6 +846,7 @@
                     <!--    'column_alias': 'listings'}                                               -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =          -->
                         <!--   Pass Only Elements:  -->
@@ -849,6 +858,7 @@
                         <!--    'column_alias': 'listings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_11 -->
@@ -1122,6 +1132,7 @@
                             <!--    'column_alias': 'smallest_listing'}                    -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'listings_latest' -->
                                 <!-- node_id = ss_10004 -->
@@ -1351,6 +1362,7 @@
                                 <!--    'column_alias': 'listing__user'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.dim_listings_latest -->
                                     <!-- node_id = tfc_10004 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
index 0e45f45d49..56019abdcb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
@@ -16,6 +16,7 @@
         <!--    'column_alias': 'bookings'}                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_17 -->
@@ -41,6 +42,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_916),  -->
             <!--    'column_alias': 'listing__user__home_state_latest'}    -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description =                                                             -->
                 <!--   Pass Only Elements:                                                     -->
@@ -60,6 +62,7 @@
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Join Standard Outputs -->
                     <!-- node_id = ss_15 -->
@@ -95,6 +98,7 @@
                     <!--    'join_type': SqlJoinType.LEFT_OUTER,                    -->
                     <!--    'on_condition': SqlLogicalExpression(node_id=lo_2)}     -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                                    -->
                         <!--   Pass Only Elements:                            -->
@@ -114,6 +118,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_10 -->
@@ -487,6 +492,7 @@
                             <!--    'column_alias': 'average_booking_value'}               -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10015) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                 <!-- node_id = ss_10015 -->
@@ -820,6 +826,7 @@
                                 <!--    'column_alias': 'booking__user'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10015) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.fct_bookings -->
                                     <!-- node_id = tfc_10015 -->
@@ -851,6 +858,7 @@
                         <!--    'column_alias': 'user__home_state_latest'}             -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Join Standard Outputs -->
                             <!-- node_id = ss_13 -->
@@ -1122,6 +1130,7 @@
                             <!--    'join_type': SqlJoinType.LEFT_OUTER,                     -->
                             <!--    'on_condition': SqlComparisonExpression(node_id=cmp_3)}  -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'listings' -->
                                 <!-- node_id = ss_10017 -->
@@ -1339,6 +1348,7 @@
                                 <!--    'column_alias': 'listing__user'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10017) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.dim_listings -->
                                     <!-- node_id = tfc_10017 -->
@@ -1476,6 +1486,7 @@
                                 <!--    'column_alias': 'user__home_state_latest'}             -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10021) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Read Elements From Semantic Model 'users_latest' -->
                                     <!-- node_id = ss_10021 -->
@@ -1581,6 +1592,7 @@
                                     <!--    'column_alias': 'user'}                                  -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10021) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlTableFromClauseNode>
                                         <!-- description = Read from ***************************.dim_users_latest -->
                                         <!-- node_id = tfc_10021 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
index 67926e1bcb..544c3ba880 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
@@ -16,6 +16,7 @@
         <!--    'column_alias': 'bookings'}                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_11 -->
@@ -41,6 +42,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),      -->
             <!--    'column_alias': 'listing__lux_listing__is_confirmed_lux'}  -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description =                                                                   -->
                 <!--   Pass Only Elements:                                                           -->
@@ -60,6 +62,7 @@
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Join Standard Outputs -->
                     <!-- node_id = ss_9 -->
@@ -95,6 +98,7 @@
                     <!--    'join_type': SqlJoinType.LEFT_OUTER,                   -->
                     <!--    'on_condition': SqlLogicalExpression(node_id=lo_2)}    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                                    -->
                         <!--   Pass Only Elements:                            -->
@@ -114,6 +118,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_4) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_4 -->
@@ -487,6 +492,7 @@
                             <!--    'column_alias': 'average_booking_value'}               -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10015) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                 <!-- node_id = ss_10015 -->
@@ -820,6 +826,7 @@
                                 <!--    'column_alias': 'booking__user'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10015) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.fct_bookings -->
                                     <!-- node_id = tfc_10015 -->
@@ -854,6 +861,7 @@
                         <!--    'column_alias': 'lux_listing__is_confirmed_lux'}       -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Join Standard Outputs -->
                             <!-- node_id = ss_7 -->
@@ -969,6 +977,7 @@
                             <!--    'join_type': SqlJoinType.LEFT_OUTER,                     -->
                             <!--    'on_condition': SqlComparisonExpression(node_id=cmp_1)}  -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'lux_listing_mapping' -->
                                 <!-- node_id = ss_10018 -->
@@ -986,6 +995,7 @@
                                 <!--    'column_alias': 'listing__lux_listing'}                  -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10018) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description =                                                       -->
                                     <!--   Read from ***************************.dim_lux_listing_id_mapping  -->
@@ -1234,6 +1244,7 @@
                                 <!--    'column_alias': 'lux_listing__is_confirmed_lux'}       -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10019) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Read Elements From Semantic Model 'lux_listings' -->
                                     <!-- node_id = ss_10019 -->
@@ -1427,6 +1438,7 @@
                                     <!--    'column_alias': 'lux_listing'}                           -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10019) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlTableFromClauseNode>
                                         <!-- description = Read from ***************************.dim_lux_listings -->
                                         <!-- node_id = tfc_10019 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_join_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_join_node__plan0.xml
index 86d176f9cb..3268ab93ba 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_join_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_join_node__plan0.xml
@@ -32,6 +32,7 @@
         <!--    'join_type': SqlJoinType.LEFT_OUTER,                     -->
         <!--    'on_condition': SqlComparisonExpression(node_id=cmp_1)}  -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description =                -->
             <!--   Pass Only Elements:        -->
@@ -47,6 +48,7 @@
             <!--    'column_alias': 'bookings'}                          -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                 <!-- node_id = ss_10001 -->
@@ -404,6 +406,7 @@
                 <!--    'column_alias': 'booking__host'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlTableFromClauseNode>
                     <!-- description = Read from ***************************.fct_bookings -->
                     <!-- node_id = tfc_10001 -->
@@ -426,6 +429,7 @@
             <!--    'column_alias': 'country_latest'}                    -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Read Elements From Semantic Model 'listings_latest' -->
                 <!-- node_id = ss_10004 -->
@@ -655,6 +659,7 @@
                 <!--    'column_alias': 'listing__user'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlTableFromClauseNode>
                     <!-- description = Read from ***************************.dim_listings_latest -->
                     <!-- node_id = tfc_10004 -->
@@ -677,6 +682,7 @@
             <!--    'column_alias': 'country_latest'}                    -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Read Elements From Semantic Model 'listings_latest' -->
                 <!-- node_id = ss_10004 -->
@@ -906,6 +912,7 @@
                 <!--    'column_alias': 'listing__user'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlTableFromClauseNode>
                     <!-- description = Read from ***************************.dim_listings_latest -->
                     <!-- node_id = tfc_10004 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
index fd39b3fa96..e3085235b7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'txn_count'}                           -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_10 -->
@@ -29,6 +30,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),      -->
             <!--    'column_alias': 'account_id__customer_id__customer_name'}  -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description =                                                -->
                 <!--   Pass Only Elements:                                        -->
@@ -44,6 +46,7 @@
                 <!--    'column_alias': 'txn_count'}                           -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Join Standard Outputs -->
                     <!-- node_id = ss_8 -->
@@ -75,6 +78,7 @@
                     <!--    'join_type': SqlJoinType.LEFT_OUTER,                   -->
                     <!--    'on_condition': SqlLogicalExpression(node_id=lo_2)}    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                                           -->
                         <!--   Pass Only Elements:                                   -->
@@ -94,6 +98,7 @@
                         <!--    'column_alias': 'txn_count'}                           -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_3) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_3 -->
@@ -335,6 +340,7 @@
                             <!--    'column_alias': 'txn_count'}                           -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10010) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'account_month_txns' -->
                                 <!-- node_id = ss_10010 -->
@@ -532,6 +538,7 @@
                                 <!--    'column_alias': 'account_id'}                            -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10010) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.account_month_txns -->
                                     <!-- node_id = tfc_10010 -->
@@ -559,6 +566,7 @@
                         <!--    'column_alias': 'customer_id__customer_name'}          -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_6) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Join Standard Outputs -->
                             <!-- node_id = ss_6 -->
@@ -786,6 +794,7 @@
                             <!--    'join_type': SqlJoinType.LEFT_OUTER,                   -->
                             <!--    'on_condition': SqlLogicalExpression(node_id=lo_1)}    -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'bridge_table' -->
                                 <!-- node_id = ss_10011 -->
@@ -955,6 +964,7 @@
                                 <!--    'column_alias': 'bridge_account__customer_id'}           -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10011) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.bridge_table -->
                                     <!-- node_id = tfc_10011 -->
@@ -1102,6 +1112,7 @@
                                 <!--    'column_alias': 'customer_id__customer_atomic_weight'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10013) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Read Elements From Semantic Model 'customer_table' -->
                                     <!-- node_id = ss_10013 -->
@@ -1215,6 +1226,7 @@
                                     <!--    'column_alias': 'customer_id'}                           -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10013) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlTableFromClauseNode>
                                         <!-- description = Read from ***************************.customer_table -->
                                         <!-- node_id = tfc_10013 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multiple_metrics_no_dimensions__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multiple_metrics_no_dimensions__plan0.xml
index 1892a3747a..2527800012 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multiple_metrics_no_dimensions__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multiple_metrics_no_dimensions__plan0.xml
@@ -18,6 +18,7 @@
         <!--    'join_type': SqlJoinType.CROSS_JOIN,                    -->
         <!--    'on_condition': None}                                   -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Compute Metrics via Expressions -->
             <!-- node_id = ss_15 -->
@@ -27,6 +28,7 @@
             <!--    'column_alias': 'bookings'}                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = ss_14 -->
@@ -36,6 +38,7 @@
                 <!--    'column_alias': 'bookings'}                                               -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =          -->
                     <!--   Pass Only Elements:  -->
@@ -47,6 +50,7 @@
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                                                         -->
                         <!--   Constrain Time Range to [2020-01-01T00:00:00, 2020-01-01T00:00:00]  -->
@@ -445,6 +449,7 @@
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                         <!-- where = SqlBetweenExpression(node_id=betw_2) -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_11 -->
@@ -842,6 +847,7 @@
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                 <!-- node_id = ss_10001 -->
@@ -1199,6 +1205,7 @@
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.fct_bookings -->
                                     <!-- node_id = tfc_10001 -->
@@ -1219,6 +1226,7 @@
             <!--    'column_alias': 'listings'}                             -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_19) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = ss_19 -->
@@ -1228,6 +1236,7 @@
                 <!--    'column_alias': 'listings'}                                               -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_18) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =          -->
                     <!--   Pass Only Elements:  -->
@@ -1239,6 +1248,7 @@
                     <!--    'column_alias': 'listings'}                             -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                                                         -->
                         <!--   Constrain Time Range to [2020-01-01T00:00:00, 2020-01-01T00:00:00]  -->
@@ -1513,6 +1523,7 @@
                         <!--    'column_alias': 'smallest_listing'}                     -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_16) -->
                         <!-- where = SqlBetweenExpression(node_id=betw_3) -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_16 -->
@@ -1786,6 +1797,7 @@
                             <!--    'column_alias': 'smallest_listing'}                    -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'listings_latest' -->
                                 <!-- node_id = ss_10004 -->
@@ -2015,6 +2027,7 @@
                                 <!--    'column_alias': 'listing__user'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.dim_listings_latest -->
                                     <!-- node_id = tfc_10004 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_nested_derived_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_nested_derived_metric__plan0.xml
index 11a3334069..f9faa5a469 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_nested_derived_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_nested_derived_metric__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'instant_plus_non_referred_bookings_pct'}                                       -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_25) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Combine Metrics -->
             <!-- node_id = ss_25 -->
@@ -45,6 +46,7 @@
             <!--    'join_type': SqlJoinType.INNER,                         -->
             <!--    'on_condition': SqlLogicalExpression(node_id=lo_5)}     -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Compute Metrics via Expressions -->
                 <!-- node_id = ss_16 -->
@@ -58,6 +60,7 @@
                 <!--    'column_alias': 'non_referred'}                                                                  -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Combine Metrics -->
                     <!-- node_id = ss_15 -->
@@ -81,6 +84,7 @@
                     <!--    'join_type': SqlJoinType.INNER,                         -->
                     <!--    'on_condition': SqlLogicalExpression(node_id=lo_1)}     -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Compute Metrics via Expressions -->
                         <!-- node_id = ss_10 -->
@@ -94,6 +98,7 @@
                         <!--    'column_alias': 'ref_bookings'}                        -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Aggregate Measures -->
                             <!-- node_id = ss_9 -->
@@ -111,6 +116,7 @@
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description =                                  -->
                                 <!--   Pass Only Elements:                          -->
@@ -126,6 +132,7 @@
                                 <!--    'column_alias': 'referred_bookings'}                   -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
                                     <!-- node_id = ss_7 -->
@@ -523,6 +530,7 @@
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlSelectStatementNode>
                                         <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                         <!-- node_id = ss_10001 -->
@@ -880,6 +888,7 @@
                                         <!--    'column_alias': 'booking__host'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                         <!-- where = None -->
+                                        <!-- distinct = False -->
                                         <SqlTableFromClauseNode>
                                             <!-- description = Read from ***************************.fct_bookings -->
                                             <!-- node_id = tfc_10001 -->
@@ -903,6 +912,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Aggregate Measures -->
                             <!-- node_id = ss_13 -->
@@ -920,6 +930,7 @@
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description =                         -->
                                 <!--   Pass Only Elements:                 -->
@@ -935,6 +946,7 @@
                                 <!--    'column_alias': 'bookings'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
                                     <!-- node_id = ss_11 -->
@@ -1332,6 +1344,7 @@
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlSelectStatementNode>
                                         <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                         <!-- node_id = ss_10001 -->
@@ -1689,6 +1702,7 @@
                                         <!--    'column_alias': 'booking__host'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                         <!-- where = None -->
+                                        <!-- distinct = False -->
                                         <SqlTableFromClauseNode>
                                             <!-- description = Read from ***************************.fct_bookings -->
                                             <!-- node_id = tfc_10001 -->
@@ -1714,6 +1728,7 @@
                 <!--    'column_alias': 'instant'}                             -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_19) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_19 -->
@@ -1731,6 +1746,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                                 -->
                         <!--   Pass Only Elements:                         -->
@@ -1746,6 +1762,7 @@
                         <!--    'column_alias': 'instant_bookings'}                    -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_17 -->
@@ -2143,6 +2160,7 @@
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                 <!-- node_id = ss_10001 -->
@@ -2500,6 +2518,7 @@
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.fct_bookings -->
                                     <!-- node_id = tfc_10001 -->
@@ -2523,6 +2542,7 @@
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_23) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_23 -->
@@ -2540,6 +2560,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_868),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                         -->
                         <!--   Pass Only Elements:                 -->
@@ -2555,6 +2576,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_21) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_21 -->
@@ -2952,6 +2974,7 @@
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                 <!-- node_id = ss_10001 -->
@@ -3309,6 +3332,7 @@
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.fct_bookings -->
                                     <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_offset_window_with_date_part__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_offset_window_with_date_part__plan0.xml
index 92630d354a..3280d37abf 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_offset_window_with_date_part__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_offset_window_with_date_part__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'bookings_growth_2_weeks'}                                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Combine Metrics -->
             <!-- node_id = ss_17 -->
@@ -35,6 +36,7 @@
             <!--    'join_type': SqlJoinType.INNER,                         -->
             <!--    'on_condition': SqlLogicalExpression(node_id=lo_1)}     -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Compute Metrics via Expressions -->
                 <!-- node_id = ss_10 -->
@@ -48,6 +50,7 @@
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_9 -->
@@ -65,6 +68,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                     <!--    'column_alias': 'metric_time__extract_dow'}            -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                                 -->
                         <!--   Pass Only Elements:                         -->
@@ -80,6 +84,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_7 -->
@@ -477,6 +482,7 @@
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                 <!-- node_id = ss_10001 -->
@@ -834,6 +840,7 @@
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.fct_bookings -->
                                     <!-- node_id = tfc_10001 -->
@@ -857,6 +864,7 @@
                 <!--    'column_alias': 'bookings_2_weeks_ago'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Aggregate Measures -->
                     <!-- node_id = ss_15 -->
@@ -874,6 +882,7 @@
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                     <!--    'column_alias': 'metric_time__extract_dow'}            -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                                 -->
                         <!--   Pass Only Elements:                         -->
@@ -889,6 +898,7 @@
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Join to Time Spine Dataset -->
                             <!-- node_id = ss_13 -->
@@ -1252,6 +1262,7 @@
                             <!--    'join_type': SqlJoinType.INNER,                          -->
                             <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Date Spine -->
                                 <!-- node_id = ss_12 -->
@@ -1261,6 +1272,7 @@
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.mf_time_spine -->
                                     <!-- node_id = tfc_0 -->
@@ -1664,6 +1676,7 @@
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlSelectStatementNode>
                                     <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                                     <!-- node_id = ss_10001 -->
@@ -2021,6 +2034,7 @@
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
+                                    <!-- distinct = False -->
                                     <SqlTableFromClauseNode>
                                         <!-- description = Read from ***************************.fct_bookings -->
                                         <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_order_by_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_order_by_node__plan0.xml
index 402e2ef39d..76e0ba86fd 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_order_by_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_order_by_node__plan0.xml
@@ -24,6 +24,7 @@
         <!--   {'class': 'SqlOrderByDescription',                     -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10),  -->
         <!--    'desc': True}                                         -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Compute Metrics via Expressions -->
             <!-- node_id = ss_2 -->
@@ -41,6 +42,7 @@
             <!--    'column_alias': 'bookings'}                          -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_1) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = ss_1 -->
@@ -66,6 +68,7 @@
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_4),  -->
                 <!--    'column_alias': 'is_instant'}                        -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =                              -->
                     <!--   Pass Only Elements:                      -->
@@ -85,6 +88,7 @@
                     <!--    'column_alias': 'bookings'}                          -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                         <!-- node_id = ss_10001 -->
@@ -442,6 +446,7 @@
                         <!--    'column_alias': 'booking__host'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlTableFromClauseNode>
                             <!-- description = Read from ***************************.fct_bookings -->
                             <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_partitioned_join__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_partitioned_join__plan0.xml
index 057644727a..ea263bdf36 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_partitioned_join__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_partitioned_join__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'identity_verifications'}              -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_12 -->
@@ -29,6 +30,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
             <!--    'column_alias': 'user__home_state'}                    -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description =                                       -->
                 <!--   Pass Only Elements:                               -->
@@ -44,6 +46,7 @@
                 <!--    'column_alias': 'identity_verifications'}              -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Join Standard Outputs -->
                     <!-- node_id = ss_10 -->
@@ -75,6 +78,7 @@
                     <!--    'join_type': SqlJoinType.LEFT_OUTER,                   -->
                     <!--    'on_condition': SqlLogicalExpression(node_id=lo_0)}    -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description =                                                  -->
                         <!--   Pass Only Elements:                                          -->
@@ -94,6 +98,7 @@
                         <!--    'column_alias': 'identity_verifications'}              -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_7 -->
@@ -343,6 +348,7 @@
                             <!--    'column_alias': 'identity_verifications'}              -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10003) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlSelectStatementNode>
                                 <!-- description = Read Elements From Semantic Model 'id_verifications' -->
                                 <!-- node_id = ss_10003 -->
@@ -548,6 +554,7 @@
                                 <!--    'column_alias': 'verification__user'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10003) -->
                                 <!-- where = None -->
+                                <!-- distinct = False -->
                                 <SqlTableFromClauseNode>
                                     <!-- description = Read from ***************************.fct_id_verifications -->
                                     <!-- node_id = tfc_10003 -->
@@ -575,6 +582,7 @@
                         <!--    'column_alias': 'home_state'}                          -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10007) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Read Elements From Semantic Model 'users_ds_source' -->
                             <!-- node_id = ss_10007 -->
@@ -856,6 +864,7 @@
                             <!--    'column_alias': 'user'}                                  -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10007) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlTableFromClauseNode>
                                 <!-- description = Read from ***************************.dim_users -->
                                 <!-- node_id = tfc_10007 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node__plan0.xml
index 3b31be5065..187f6f44d1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node__plan0.xml
@@ -126,6 +126,7 @@
         <!--    'join_type': SqlJoinType.INNER,                          -->
         <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Read Elements From Semantic Model 'accounts_source' -->
             <!-- node_id = ss_10000 -->
@@ -247,6 +248,7 @@
             <!--    'column_alias': 'account__user'}                         -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10000) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlTableFromClauseNode>
                 <!-- description = Read from ***************************.fct_accounts -->
                 <!-- node_id = tfc_10000 -->
@@ -262,6 +264,7 @@
             <!--    'column_alias': 'ds__day__complete'}                                      -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10000) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Read Elements From Semantic Model 'accounts_source' -->
                 <!-- node_id = ss_10000 -->
@@ -383,6 +386,7 @@
                 <!--    'column_alias': 'account__user'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10000) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlTableFromClauseNode>
                     <!-- description = Read from ***************************.fct_accounts -->
                     <!-- node_id = tfc_10000 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_grouping__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_grouping__plan0.xml
index c4d1d06282..364d97e86d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_grouping__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_grouping__plan0.xml
@@ -126,6 +126,7 @@
         <!--    'join_type': SqlJoinType.INNER,                        -->
         <!--    'on_condition': SqlLogicalExpression(node_id=lo_0)}    -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Read Elements From Semantic Model 'accounts_source' -->
             <!-- node_id = ss_10000 -->
@@ -247,6 +248,7 @@
             <!--    'column_alias': 'account__user'}                         -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10000) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlTableFromClauseNode>
                 <!-- description = Read from ***************************.fct_accounts -->
                 <!-- node_id = tfc_10000 -->
@@ -270,6 +272,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1),  -->
             <!--    'column_alias': 'user'}                              -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Read Elements From Semantic Model 'accounts_source' -->
                 <!-- node_id = ss_10000 -->
@@ -391,6 +394,7 @@
                 <!--    'column_alias': 'account__user'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10000) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlTableFromClauseNode>
                     <!-- description = Read from ***************************.fct_accounts -->
                     <!-- node_id = tfc_10000 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml
index c65adb8572..c877290f10 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml
@@ -126,6 +126,7 @@
         <!--    'join_type': SqlJoinType.INNER,                          -->
         <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Read Elements From Semantic Model 'accounts_source' -->
             <!-- node_id = ss_10000 -->
@@ -247,6 +248,7 @@
             <!--    'column_alias': 'account__user'}                         -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10000) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlTableFromClauseNode>
                 <!-- description = Read from ***************************.fct_accounts -->
                 <!-- node_id = tfc_10000 -->
@@ -270,6 +272,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1),  -->
             <!--    'column_alias': 'ds__week'}                          -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Read Elements From Semantic Model 'accounts_source' -->
                 <!-- node_id = ss_10000 -->
@@ -391,6 +394,7 @@
                 <!--    'column_alias': 'account__user'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10000) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlTableFromClauseNode>
                     <!-- description = Read from ***************************.fct_accounts -->
                     <!-- node_id = tfc_10000 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_simple_query_with_date_part__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_simple_query_with_date_part__plan0.xml
index aea8e018ef..59866ae97e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_simple_query_with_date_part__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_simple_query_with_date_part__plan0.xml
@@ -12,6 +12,7 @@
         <!--    'column_alias': 'bookings'}                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_9 -->
@@ -29,6 +30,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
             <!--    'column_alias': 'metric_time__extract_dow'}            -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description =                                 -->
                 <!--   Pass Only Elements:                         -->
@@ -44,6 +46,7 @@
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Metric Time Dimension 'ds' -->
                     <!-- node_id = ss_7 -->
@@ -441,6 +444,7 @@
                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                         <!-- node_id = ss_10001 -->
@@ -798,6 +802,7 @@
                         <!--    'column_alias': 'booking__host'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlTableFromClauseNode>
                             <!-- description = Read from ***************************.fct_bookings -->
                             <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_simple_query_with_multiple_date_parts__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_simple_query_with_multiple_date_parts__plan0.xml
index c4cc5618c4..f55390be76 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_simple_query_with_multiple_date_parts__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_simple_query_with_multiple_date_parts__plan0.xml
@@ -32,6 +32,7 @@
         <!--    'column_alias': 'bookings'}                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Aggregate Measures -->
             <!-- node_id = ss_9 -->
@@ -89,6 +90,7 @@
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
             <!--    'column_alias': 'metric_time__extract_doy'}            -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description =                         -->
                 <!--   Pass Only Elements:                 -->
@@ -130,6 +132,7 @@
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description = Metric Time Dimension 'ds' -->
                     <!-- node_id = ss_7 -->
@@ -527,6 +530,7 @@
                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                         <!-- node_id = ss_10001 -->
@@ -884,6 +888,7 @@
                         <!--    'column_alias': 'booking__host'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlTableFromClauseNode>
                             <!-- description = Read from ***************************.fct_bookings -->
                             <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_single_join_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_single_join_node__plan0.xml
index 48afce360f..ab795d1fad 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_single_join_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_single_join_node__plan0.xml
@@ -18,6 +18,7 @@
         <!--    'join_type': SqlJoinType.LEFT_OUTER,                     -->
         <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description =                -->
             <!--   Pass Only Elements:        -->
@@ -33,6 +34,7 @@
             <!--    'column_alias': 'bookings'}                          -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                 <!-- node_id = ss_10001 -->
@@ -390,6 +392,7 @@
                 <!--    'column_alias': 'booking__host'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlTableFromClauseNode>
                     <!-- description = Read from ***************************.fct_bookings -->
                     <!-- node_id = tfc_10001 -->
@@ -412,6 +415,7 @@
             <!--    'column_alias': 'listing__country_latest'}           -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Read Elements From Semantic Model 'listings_latest' -->
                 <!-- node_id = ss_10004 -->
@@ -641,6 +645,7 @@
                 <!--    'column_alias': 'listing__user'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlTableFromClauseNode>
                     <!-- description = Read from ***************************.dim_listings_latest -->
                     <!-- node_id = tfc_10004 -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_source_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_source_node__plan0.xml
index 89948cc666..13fda71ede 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_source_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_source_node__plan0.xml
@@ -356,6 +356,7 @@
         <!--    'column_alias': 'booking__host'}                         -->
         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlTableFromClauseNode>
             <!-- description = Read from ***************************.fct_bookings -->
             <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml
index 2e1a787a23..18da8dd77c 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml
@@ -348,6 +348,7 @@
         <!--    'column_alias': 'booking_payments'}                  -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Read Elements From Semantic Model 'bookings_source' -->
             <!-- node_id = ss_10001 -->
@@ -705,6 +706,7 @@
             <!--    'column_alias': 'booking__host'}                         -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlTableFromClauseNode>
                 <!-- description = Read from ***************************.fct_bookings -->
                 <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml
index db9f23a206..74cd78ad59 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml
@@ -396,6 +396,7 @@
         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Read Elements From Semantic Model 'bookings_source' -->
             <!-- node_id = ss_10001 -->
@@ -753,6 +754,7 @@
             <!--    'column_alias': 'booking__host'}                         -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlTableFromClauseNode>
                 <!-- description = Read from ***************************.fct_bookings -->
                 <!-- node_id = tfc_10001 -->
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml
index e8cd14dee9..3ade70ad35 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml
@@ -26,6 +26,7 @@
         <!--    'expr': SqlAggregateFunctionExpression(node_id=fnc_4, sql_function=COALESCE),  -->
         <!--    'column_alias': 'metric_time__day'}                                            -->
         <!-- where = None -->
+        <!-- distinct = False -->
         <SqlSelectStatementNode>
             <!-- description = Compute Metrics via Expressions -->
             <!-- node_id = ss_10 -->
@@ -39,6 +40,7 @@
             <!--    'column_alias': 'bookings'}                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = ss_9 -->
@@ -56,6 +58,7 @@
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =                         -->
                     <!--   Pass Only Elements:                 -->
@@ -71,6 +74,7 @@
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Metric Time Dimension 'ds' -->
                         <!-- node_id = ss_7 -->
@@ -468,6 +472,7 @@
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                             <!-- node_id = ss_10001 -->
@@ -825,6 +830,7 @@
                             <!--    'column_alias': 'booking__host'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlTableFromClauseNode>
                                 <!-- description = Read from ***************************.fct_bookings -->
                                 <!-- node_id = tfc_10001 -->
@@ -848,6 +854,7 @@
             <!--    'column_alias': 'booking_payments'}                    -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
             <!-- where = None -->
+            <!-- distinct = False -->
             <SqlSelectStatementNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = ss_13 -->
@@ -865,6 +872,7 @@
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
+                <!-- distinct = False -->
                 <SqlSelectStatementNode>
                     <!-- description =                                 -->
                     <!--   Pass Only Elements:                         -->
@@ -880,6 +888,7 @@
                     <!--    'column_alias': 'booking_payments'}                    -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                     <!-- where = None -->
+                    <!-- distinct = False -->
                     <SqlSelectStatementNode>
                         <!-- description = Metric Time Dimension 'paid_at' -->
                         <!-- node_id = ss_11 -->
@@ -1229,6 +1238,7 @@
                         <!--    'column_alias': 'booking_payments'}                    -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
+                        <!-- distinct = False -->
                         <SqlSelectStatementNode>
                             <!-- description = Read Elements From Semantic Model 'bookings_source' -->
                             <!-- node_id = ss_10001 -->
@@ -1586,6 +1596,7 @@
                             <!--    'column_alias': 'booking__host'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                             <!-- where = None -->
+                            <!-- distinct = False -->
                             <SqlTableFromClauseNode>
                                 <!-- description = Read from ***************************.fct_bookings -->
                                 <!-- node_id = tfc_10001 -->