fix(tesseract): Issue with multistage rolling window without time dimension

rust/cubesqlplanner/cubesqlplanner/src/planner/planners/multi_stage/multi_stage_query_planner.rs

@@ -473,15 +473,21 @@ impl MultiStageQueryPlanner {
                     }
                 }
 
+                let base_member = MemberSymbol::new_measure(measure.new_unrolling());
+
                 if time_dimensions.is_empty() {
                     let base_state =
                         self.replace_date_range_for_rolling_window(&rolling_window, state.clone())?;
-                    let rolling_base = self.add_rolling_window_base(
-                        member.clone(),
-                        base_state,
-                        ungrouped,
-                        descriptions,
-                    )?;
+                    let rolling_base = if !measure.is_multi_stage() {
+                        self.add_rolling_window_base(base_member, base_state, false, descriptions)?
+                    } else {
+                        self.make_queries_descriptions(
+                            base_member,
+                            base_state,
+                            descriptions,
+                            resolved_multi_stage_dimensions,
+                        )?
+                    };
                     return Ok(Some(rolling_base));
                 }
                 let uniq_time_dimensions = time_dimensions
@@ -504,7 +510,6 @@ impl MultiStageQueryPlanner {
                     &rolling_window,
                     state.clone(),
                 )?;
-                let base_member = MemberSymbol::new_measure(measure.new_unrolling());
 
                 let time_series =
                     self.add_time_series(time_dimension.clone(), state.clone(), descriptions)?;

rust/cubesqlplanner/cubesqlplanner/src/test_fixtures/schemas/yaml_files/common/integration_rolling_window.yaml

@@ -85,6 +85,19 @@ cubes:
             rolling_window:
                 type: to_date
                 granularity: month
+          - name: rolling_avg_to_date
+            type: avg
+            sql: amount
+            rolling_window:
+                type: to_date
+                granularity: month
+          - name: rolling_sum_to_date_multistage
+            multi_stage: true
+            type: sum
+            sql: "{total_amount}"
+            rolling_window:
+                type: to_date
+                granularity: month
           # Cat 2 — different aggregation types (all trailing 7 day)
           - name: rolling_count_7d
             type: count

rust/cubesqlplanner/cubesqlplanner/src/tests/integration/rolling_window/snapshots/cubesqlplanner__tests__integration__rolling_window__to_date_variations__to_date_avg_no_time_dimension.snap

@@ -0,0 +1,7 @@
+---
+source: cubesqlplanner/src/tests/integration/rolling_window/to_date_variations.rs
+expression: result
+---
+orders__rolling_avg_to_date
+---------------------------
+137.7500000000000000

rust/cubesqlplanner/cubesqlplanner/src/tests/integration/rolling_window/snapshots/cubesqlplanner__tests__integration__rolling_window__to_date_variations__to_date_no_granularity_multistage.snap

@@ -0,0 +1,7 @@
+---
+source: cubesqlplanner/src/tests/integration/rolling_window/to_date_variations.rs
+expression: result
+---
+orders__rolling_sum_to_date_multistage
+--------------------------------------
+2755.00

rust/cubesqlplanner/cubesqlplanner/src/tests/integration/rolling_window/to_date_variations.rs

@@ -166,7 +166,49 @@ async fn test_to_date_no_granularity() {
     "#};
 
     let result = ctx.build_sql(query);
-    // to_date without query granularity — may work or error
+    match result {
+        Ok(_sql) => {
+            if let Some(result) = ctx.try_execute_pg(query, SEED).await {
+                insta::assert_snapshot!(result);
+            }
+        }
+        Err(e) => {
+            insta::assert_snapshot!("to_date_no_granularity_error", e.to_string());
+        }
+    }
+}
+#[tokio::test(flavor = "multi_thread")]
+async fn test_to_date_no_granularity_multistage() {
+    let ctx = create_context();
+
+    let query = indoc! {r#"
+        measures:
+          - orders.rolling_sum_to_date_multistage
+    "#};
+
+    let result = ctx.build_sql(query);
+    match result {
+        Ok(_sql) => {
+            if let Some(result) = ctx.try_execute_pg(query, SEED).await {
+                insta::assert_snapshot!(result);
+            }
+        }
+        Err(e) => {
+            insta::assert_snapshot!("to_date_no_granularity_error", e.to_string());
+        }
+    }
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_to_date_avg_no_time_dimension() {
+    let ctx = create_context();
+
+    let query = indoc! {r#"
+        measures:
+          - orders.rolling_avg_to_date
+    "#};
+
+    let result = ctx.build_sql(query);
     match result {
         Ok(_sql) => {
             if let Some(result) = ctx.try_execute_pg(query, SEED).await {