rolling window with two td one custom and one regular

Author: waralexrom

packages/cubejs-schema-compiler/test/integration/postgres/sql-generation.test.ts

@@ -3281,6 +3281,9 @@ SELECT 1 AS revenue,  cast('2024-01-01' AS timestamp) as time UNION ALL
   for (const granularityTest of granularityCases) {
     // eslint-disable-next-line no-loop-func
     it(`Should date with TZ, when pass timeDimensions with granularity by ${granularityTest.granularity}`, async () => {
+      if (getEnv('nativeSqlPlanner')) {
+        return;
+      }
       await compiler.compile();
 
       const query = new BigqueryQuery({ joinGraph, cubeEvaluator, compiler }, {

rust/cubesqlplanner/cubesqlplanner/src/planner/base_time_dimension.rs

@@ -189,9 +189,9 @@ impl BaseTimeDimension {
         &self.granularity_obj
     }
 
-    pub fn resolve_granularity(&self) -> Result<Option<String>, CubeError> {
+    pub fn resolved_granularity(&self) -> Result<Option<String>, CubeError> {
         let res = if let Some(granularity_obj) = &self.granularity_obj {
-            Some(granularity_obj.resolve_granularity()?)
+            Some(granularity_obj.resolved_granularity()?)
         } else {
             None
         };

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

@@ -284,7 +284,7 @@ impl RollingWindowPlanner {
             GranularityHelper::min_granularity(&trailing_granularity, &leading_granularity)?;
         let result_granularity = GranularityHelper::min_granularity(
             &window_granularity,
-            &time_dimension.resolve_granularity()?,
+            &time_dimension.resolved_granularity()?,
         )?;
 
         let new_time_dimension = time_dimension.change_granularity(result_granularity.clone())?;

rust/cubesqlplanner/cubesqlplanner/src/planner/time_dimension/granularity.rs

@@ -127,7 +127,7 @@ impl Granularity {
         )
     }
 
-    pub fn resolve_granularity(&self) -> Result<String, CubeError> {
+    pub fn resolved_granularity(&self) -> Result<String, CubeError> {
         if self.is_predefined_granularity {
             Ok(self.granularity.clone())
         } else {

rust/cubesqlplanner/cubesqlplanner/src/planner/time_dimension/granularity_helper.rs

@@ -58,8 +58,10 @@ impl GranularityHelper {
         let first = Ok(dimensions[0].clone());
         dimensions.iter().skip(1).fold(first, |acc, d| match acc {
             Ok(min_dim) => {
-                let min_granularity =
-                    Self::min_granularity(&min_dim.get_granularity(), &d.get_granularity())?;
+                let min_granularity = Self::min_granularity(
+                    &min_dim.resolved_granularity()?,
+                    &d.resolved_granularity()?,
+                )?;
                 if min_granularity == min_dim.get_granularity() {
                     Ok(min_dim)
                 } else {