Add test non-additive dimension with non-default grain

And also update snapshots to include the new dimension
dbt-labs · Aug 28, 2024 · 323ed25 · 323ed25
1 parent 5de5474
commit 323ed25
Show file tree

Hide file tree

Showing 95 changed files with 4,450 additions and 3,842 deletions.
diff --git a/...test_helpers/semantic_manifest_yamls/simple_manifest/semantic_models/accounts_source.yaml b/...test_helpers/semantic_manifest_yamls/simple_manifest/semantic_models/accounts_source.yaml
@@ -30,11 +30,24 @@ semantic_model:
         window_groupings:
           - user
 
+    - name: total_account_balance_first_day_of_month
+      agg: sum
+      expr: account_balance
+      agg_time_dimension: ds_month
+      non_additive_dimension:
+        name: ds_month
+        window_choice: min
+
   dimensions:
     - name: ds
       type: time
       type_params:
         time_granularity: day
+    - name: ds_month
+      type: time
+      expr: DATE_TRUNC(ds, 'month')
+      type_params:
+        time_granularity: month
     - name: account_type
       type: categorical
 

diff --git a/...low_semantics/snapshots/test_semantic_model_container.py/dict/test_get_names__result0.txt b/...low_semantics/snapshots/test_semantic_model_container.py/dict/test_get_names__result0.txt
@@ -9,6 +9,7 @@
     'created_at',
     'ds',
     'ds_latest',
+    'ds_month',
     'ds_partitioned',
     'home_state',
     'home_state_latest',
@@ -46,6 +47,7 @@
     'referred_bookings',
     'smallest_listing',
     'total_account_balance_first_day',
+    'total_account_balance_first_day_of_month',
     'txn_revenue',
     'views',
     'visitors',

diff --git a/...emantic_model_container.py/tuple/test_linkable_elements_for_no_metrics_query__result0.txt b/...emantic_model_container.py/tuple/test_linkable_elements_for_no_metrics_query__result0.txt
@@ -7,6 +7,10 @@
   'account__ds__extract_month',
   'account__ds__extract_quarter',
   'account__ds__extract_year',
+  'account__ds_month__extract_month',
+  'account__ds_month__extract_quarter',
+  'account__ds_month__extract_year',
+  'account__ds_month__month',
   'account__user',
   'booking__ds__day',
   'booking__ds__extract_day',

diff --git a/...nversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_count_with_no_group_by__plan0.xml b/...nversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_count_with_no_group_by__plan0.xml
diff --git a/...py/SqlQueryPlan/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.xml b/...py/SqlQueryPlan/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.xml
diff --git a/.../snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate__plan0.xml b/.../snapshots/test_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate__plan0.xml
diff --git a/...n_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate_with_constant_properties__plan0.xml b/...n_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate_with_constant_properties__plan0.xml
diff --git a/...onversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate_with_no_group_by__plan0.xml b/...onversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate_with_no_group_by__plan0.xml
diff --git a/...est_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate_with_window__plan0.xml b/...est_conversion_metrics_to_sql.py/SqlQueryPlan/test_conversion_rate_with_window__plan0.xml
diff --git a/...napshots/test_dataflow_plan_builder.py/DataflowPlan/test_common_semantic_model__dfp_0.xml b/...napshots/test_dataflow_plan_builder.py/DataflowPlan/test_common_semantic_model__dfp_0.xml
@@ -42,7 +42,7 @@
                                 <!-- distinct = False -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = "Metric Time Dimension 'ds'" -->
-                                    <!-- node_id = NodeId(id_str='sma_28008') -->
+                                    <!-- node_id = NodeId(id_str='sma_28009') -->
                                     <!-- aggregation_time_dimension = 'ds' -->
                                     <ReadSqlSourceNode>
                                         <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
@@ -59,7 +59,7 @@
                                 <!-- distinct = False -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = "Metric Time Dimension 'ds'" -->
-                                    <!-- node_id = NodeId(id_str='sma_28012') -->
+                                    <!-- node_id = NodeId(id_str='sma_28013') -->
                                     <!-- aggregation_time_dimension = 'ds' -->
                                     <ReadSqlSourceNode>
                                         <!-- description = "Read From SemanticModelDataSet('listings_latest')" -->
@@ -110,7 +110,7 @@
                                 <!-- distinct = False -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = "Metric Time Dimension 'ds'" -->
-                                    <!-- node_id = NodeId(id_str='sma_28008') -->
+                                    <!-- node_id = NodeId(id_str='sma_28009') -->
                                     <!-- aggregation_time_dimension = 'ds' -->
                                     <ReadSqlSourceNode>
                                         <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
@@ -127,7 +127,7 @@
                                 <!-- distinct = False -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = "Metric Time Dimension 'ds'" -->
-                                    <!-- node_id = NodeId(id_str='sma_28012') -->
+                                    <!-- node_id = NodeId(id_str='sma_28013') -->
                                     <!-- aggregation_time_dimension = 'ds' -->
                                     <ReadSqlSourceNode>
                                         <!-- description = "Read From SemanticModelDataSet('listings_latest')" -->

diff --git a/...der.py/DataflowPlan/test_cumulative_metric_no_window_or_grain_with_metric_time__dfp_0.xml b/...der.py/DataflowPlan/test_cumulative_metric_no_window_or_grain_with_metric_time__dfp_0.xml
@@ -22,7 +22,7 @@
                         <!--   (TimeDimensionSpec(element_name='metric_time', time_granularity=DAY),) -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = "Metric Time Dimension 'ds'" -->
-                            <!-- node_id = NodeId(id_str='sma_28013') -->
+                            <!-- node_id = NodeId(id_str='sma_28014') -->
                             <!-- aggregation_time_dimension = 'ds' -->
                             <ReadSqlSourceNode>
                                 <!-- description = "Read From SemanticModelDataSet('revenue')" -->

diff --git a/....py/DataflowPlan/test_cumulative_metric_no_window_or_grain_without_metric_time__dfp_0.xml b/....py/DataflowPlan/test_cumulative_metric_no_window_or_grain_without_metric_time__dfp_0.xml
@@ -16,7 +16,7 @@
                     <!-- distinct = False -->
                     <MetricTimeDimensionTransformNode>
                         <!-- description = "Metric Time Dimension 'ds'" -->
-                        <!-- node_id = NodeId(id_str='sma_28013') -->
+                        <!-- node_id = NodeId(id_str='sma_28014') -->
                         <!-- aggregation_time_dimension = 'ds' -->
                         <ReadSqlSourceNode>
                             <!-- description = "Read From SemanticModelDataSet('revenue')" -->

diff --git a/...low_plan_builder.py/DataflowPlan/test_cumulative_metric_with_non_default_grain__dfp_0.xml b/...low_plan_builder.py/DataflowPlan/test_cumulative_metric_with_non_default_grain__dfp_0.xml
@@ -34,7 +34,7 @@
                             <!-- window = PydanticMetricTimeWindow(count=2, granularity=MONTH) -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = "Metric Time Dimension 'ds'" -->
-                                <!-- node_id = NodeId(id_str='sma_28013') -->
+                                <!-- node_id = NodeId(id_str='sma_28014') -->
                                 <!-- aggregation_time_dimension = 'ds' -->
                                 <ReadSqlSourceNode>
                                     <!-- description = "Read From SemanticModelDataSet('revenue')" -->

diff --git a/.../test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_window__dfp_0.xml b/.../test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_window__dfp_0.xml
@@ -23,7 +23,7 @@
                         <!-- window = PydanticMetricTimeWindow(count=2, granularity=MONTH) -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = "Metric Time Dimension 'ds'" -->
-                            <!-- node_id = NodeId(id_str='sma_28013') -->
+                            <!-- node_id = NodeId(id_str='sma_28014') -->
                             <!-- aggregation_time_dimension = 'ds' -->
                             <ReadSqlSourceNode>
                                 <!-- description = "Read From SemanticModelDataSet('revenue')" -->

diff --git a/..._builder.py/DataflowPlan/test_derived_cumulative_metric_with_non_default_grain__dfp_0.xml b/..._builder.py/DataflowPlan/test_derived_cumulative_metric_with_non_default_grain__dfp_0.xml
@@ -38,7 +38,7 @@
                                 <!-- window = PydanticMetricTimeWindow(count=2, granularity=MONTH) -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = "Metric Time Dimension 'ds'" -->
-                                    <!-- node_id = NodeId(id_str='sma_28013') -->
+                                    <!-- node_id = NodeId(id_str='sma_28014') -->
                                     <!-- aggregation_time_dimension = 'ds' -->
                                     <ReadSqlSourceNode>
                                         <!-- description = "Read From SemanticModelDataSet('revenue')" -->

diff --git a/...test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_to_grain__dfp_0.xml b/...test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_to_grain__dfp_0.xml
@@ -24,7 +24,7 @@
                             <!-- distinct = False -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = "Metric Time Dimension 'ds'" -->
-                                <!-- node_id = NodeId(id_str='sma_28008') -->
+                                <!-- node_id = NodeId(id_str='sma_28009') -->
                                 <!-- aggregation_time_dimension = 'ds' -->
                                 <ReadSqlSourceNode>
                                     <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
@@ -61,7 +61,7 @@
                                 <!-- join_type = INNER -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = "Metric Time Dimension 'ds'" -->
-                                    <!-- node_id = NodeId(id_str='sma_28008') -->
+                                    <!-- node_id = NodeId(id_str='sma_28009') -->
                                     <!-- aggregation_time_dimension = 'ds' -->
                                     <ReadSqlSourceNode>
                                         <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->

diff --git a/...s/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml b/...s/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml
@@ -36,7 +36,7 @@
                             <!-- join_type = INNER -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = "Metric Time Dimension 'ds'" -->
-                                <!-- node_id = NodeId(id_str='sma_28008') -->
+                                <!-- node_id = NodeId(id_str='sma_28009') -->
                                 <!-- aggregation_time_dimension = 'ds' -->
                                 <ReadSqlSourceNode>
                                     <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->

diff --git a/...aflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml b/...aflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml
@@ -36,7 +36,7 @@
                             <!-- join_type = INNER -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = "Metric Time Dimension 'ds'" -->
-                                <!-- node_id = NodeId(id_str='sma_28008') -->
+                                <!-- node_id = NodeId(id_str='sma_28009') -->
                                 <!-- aggregation_time_dimension = 'ds' -->
                                 <ReadSqlSourceNode>
                                     <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->

diff --git a/...st_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml b/...st_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml
@@ -42,7 +42,7 @@
                                 <!-- window = PydanticMetricTimeWindow(count=2, granularity=DAY) -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = "Metric Time Dimension 'ds'" -->
-                                    <!-- node_id = NodeId(id_str='sma_28008') -->
+                                    <!-- node_id = NodeId(id_str='sma_28009') -->
                                     <!-- aggregation_time_dimension = 'ds' -->
                                     <ReadSqlSourceNode>
                                         <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->

diff --git a/...er.py/DataflowPlan/test_dont_join_to_time_spine_if_no_time_dimension_requested__dfp_0.xml b/...er.py/DataflowPlan/test_dont_join_to_time_spine_if_no_time_dimension_requested__dfp_0.xml
@@ -16,7 +16,7 @@
                     <!-- distinct = False -->
                     <MetricTimeDimensionTransformNode>
                         <!-- description = "Metric Time Dimension 'ds'" -->
-                        <!-- node_id = NodeId(id_str='sma_28008') -->
+                        <!-- node_id = NodeId(id_str='sma_28009') -->
                         <!-- aggregation_time_dimension = 'ds' -->
                         <ReadSqlSourceNode>
                             <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->

diff --git a/...t_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_derived_metric__dfp_0.xml b/...t_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_derived_metric__dfp_0.xml
@@ -34,7 +34,7 @@
                                 <!-- distinct = False -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = "Metric Time Dimension 'ds'" -->
-                                    <!-- node_id = NodeId(id_str='sma_28008') -->
+                                    <!-- node_id = NodeId(id_str='sma_28009') -->
                                     <!-- aggregation_time_dimension = 'ds' -->
                                     <ReadSqlSourceNode>
                                         <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
@@ -86,7 +86,7 @@
                                     <!-- join_type = INNER -->
                                     <MetricTimeDimensionTransformNode>
                                         <!-- description = "Metric Time Dimension 'ds'" -->
-                                        <!-- node_id = NodeId(id_str='sma_28008') -->
+                                        <!-- node_id = NodeId(id_str='sma_28009') -->
                                         <!-- aggregation_time_dimension = 'ds' -->
                                         <ReadSqlSourceNode>
                                             <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->

diff --git a/...est_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_filters__dfp_0.xml b/...est_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_filters__dfp_0.xml
@@ -147,7 +147,7 @@
                                         <!-- time_range_end = '2020-01-05T00:00:00' -->
                                         <MetricTimeDimensionTransformNode>
                                             <!-- description = "Metric Time Dimension 'ds'" -->
-                                            <!-- node_id = NodeId(id_str='sma_28008') -->
+                                            <!-- node_id = NodeId(id_str='sma_28009') -->
                                             <!-- aggregation_time_dimension = 'ds' -->
                                             <ReadSqlSourceNode>
                                                 <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->

diff --git a/...dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_metric_time__dfp_0.xml b/...dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_metric_time__dfp_0.xml
@@ -27,7 +27,7 @@
                         <!-- distinct = False -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = "Metric Time Dimension 'ds'" -->
-                            <!-- node_id = NodeId(id_str='sma_28008') -->
+                            <!-- node_id = NodeId(id_str='sma_28009') -->
                             <!-- aggregation_time_dimension = 'ds' -->
                             <ReadSqlSourceNode>
                                 <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->

diff --git a/...flow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_non_metric_time__dfp_0.xml b/...flow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_non_metric_time__dfp_0.xml
@@ -22,7 +22,7 @@
                     <!-- distinct = False -->
                     <MetricTimeDimensionTransformNode>
                         <!-- description = "Metric Time Dimension 'ds'" -->
-                        <!-- node_id = NodeId(id_str='sma_28008') -->
+                        <!-- node_id = NodeId(id_str='sma_28009') -->
                         <!-- aggregation_time_dimension = 'ds' -->
                         <ReadSqlSourceNode>
                             <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->

diff --git a/...tricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_joined_plan__dfp_0.xml b/...tricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_joined_plan__dfp_0.xml
@@ -47,7 +47,7 @@
                             <!-- distinct = False -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = "Metric Time Dimension 'ds'" -->
-                                <!-- node_id = NodeId(id_str='sma_28008') -->
+                                <!-- node_id = NodeId(id_str='sma_28009') -->
                                 <!-- aggregation_time_dimension = 'ds' -->
                                 <ReadSqlSourceNode>
                                     <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->
@@ -64,7 +64,7 @@
                             <!-- distinct = False -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = "Metric Time Dimension 'ds'" -->
-                                <!-- node_id = NodeId(id_str='sma_28012') -->
+                                <!-- node_id = NodeId(id_str='sma_28013') -->
                                 <!-- aggregation_time_dimension = 'ds' -->
                                 <ReadSqlSourceNode>
                                     <!-- description = "Read From SemanticModelDataSet('listings_latest')" -->

diff --git a/...flow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_limit_rows_plan__dfp_0.xml b/...flow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_limit_rows_plan__dfp_0.xml
@@ -21,7 +21,7 @@
                         <!-- distinct = False -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = "Metric Time Dimension 'ds'" -->
-                            <!-- node_id = NodeId(id_str='sma_28008') -->
+                            <!-- node_id = NodeId(id_str='sma_28009') -->
                             <!-- aggregation_time_dimension = 'ds' -->
                             <ReadSqlSourceNode>
                                 <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->

diff --git a/...pshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml b/...pshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml
@@ -162,7 +162,7 @@
                                             <!-- distinct = False -->
                                             <MetricTimeDimensionTransformNode>
                                                 <!-- description = "Metric Time Dimension 'ds'" -->
-                                                <!-- node_id = NodeId(id_str='sma_28008') -->
+                                                <!-- node_id = NodeId(id_str='sma_28009') -->
                                                 <!-- aggregation_time_dimension = 'ds' -->
                                                 <ReadSqlSourceNode>
                                                     <!-- description =                                         -->
@@ -180,7 +180,7 @@
                                             <!-- distinct = False -->
                                             <MetricTimeDimensionTransformNode>
                                                 <!-- description = "Metric Time Dimension 'ds'" -->
-                                                <!-- node_id = NodeId(id_str='sma_28012') -->
+                                                <!-- node_id = NodeId(id_str='sma_28013') -->
                                                 <!-- aggregation_time_dimension = 'ds' -->
                                                 <ReadSqlSourceNode>
                                                     <!-- description =                                         -->
@@ -348,7 +348,7 @@
                                             <!-- distinct = False -->
                                             <MetricTimeDimensionTransformNode>
                                                 <!-- description = "Metric Time Dimension 'ds'" -->
-                                                <!-- node_id = NodeId(id_str='sma_28008') -->
+                                                <!-- node_id = NodeId(id_str='sma_28009') -->
                                                 <!-- aggregation_time_dimension = 'ds' -->
                                                 <ReadSqlSourceNode>
                                                     <!-- description =                                         -->
@@ -366,7 +366,7 @@
                                             <!-- distinct = False -->
                                             <MetricTimeDimensionTransformNode>
                                                 <!-- description = "Metric Time Dimension 'ds'" -->
-                                                <!-- node_id = NodeId(id_str='sma_28012') -->
+                                                <!-- node_id = NodeId(id_str='sma_28013') -->
                                                 <!-- aggregation_time_dimension = 'ds' -->
                                                 <ReadSqlSourceNode>
                                                     <!-- description =                                         -->
@@ -397,7 +397,7 @@
                             <!-- distinct = False -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = "Metric Time Dimension 'ds'" -->
-                                <!-- node_id = NodeId(id_str='sma_28008') -->
+                                <!-- node_id = NodeId(id_str='sma_28009') -->
                                 <!-- aggregation_time_dimension = 'ds' -->
                                 <ReadSqlSourceNode>
                                     <!-- description = "Read From SemanticModelDataSet('bookings_source')" -->