update

Author: waralexrom

rust/cubesqlplanner/cubesqlplanner/src/planner/query_properties.rs

@@ -451,7 +451,7 @@ impl QueryProperties {
             let time_dimensions = self
                 .time_dimensions
                 .iter()
-                .map(|d| -> Rc<dyn BaseMember> { d.clone() });
+                .map(|d| -> Rc<dyn BaseMember> { d.base_dimension().clone() });
             dimensions
                 .chain(time_dimensions)
                 .chain(measures)

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/cube_names_collector.rs

@@ -38,7 +38,7 @@ impl TraversalVisitor for CubeNamesCollector {
                     self.names.insert(name);
                 }
             }
-            MemberSymbol::TimeDimension(e) => self.apply(e.base_symbol(), &())?,
+            MemberSymbol::TimeDimension(e) => return self.on_node_traverse(e.base_symbol(), &()),
             MemberSymbol::Measure(e) => {
                 if e.owned_by_cube() {
                     self.names.insert(e.cube_name().clone());

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/join_hints_collector.rs

@@ -36,7 +36,7 @@ impl TraversalVisitor for JoinHintsCollector {
                     self.hints.push(name);
                 }
             }
-            MemberSymbol::TimeDimension(e) => self.apply(e.base_symbol(), &())?,
+            MemberSymbol::TimeDimension(e) => return self.on_node_traverse(e.base_symbol(), &()),
             MemberSymbol::Measure(e) => {
                 if e.owned_by_cube() {
                     self.hints.push(e.cube_name().clone());

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/sub_query_dimensions.rs

@@ -50,6 +50,10 @@ impl TraversalVisitor for SubQueryDimensionsCollector {
                 }
                 Ok(Some(()))
             }
+            MemberSymbol::TimeDimension(dim) => {
+                self.on_node_traverse(dim.base_symbol(), &())
+
+            }
             _ => Ok(Some(())),
         }
     }

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/time_dimension_symbol.rs

@@ -3,14 +3,22 @@ use std::rc::Rc;
 
 pub struct TimeDimensionSymbol {
     base_symbol: Rc<MemberSymbol>,
+    full_name: String,
     granularity: Option<String>,
 }
 
 impl TimeDimensionSymbol {
     pub fn new(base_symbol: Rc<MemberSymbol>, granularity: Option<String>) -> Self {
+        let name_suffix = if let Some(granularity) = &granularity {
+            granularity.clone()
+        } else {
+            "day".to_string()
+        };
+        let full_name = format!("{}_{}", base_symbol.full_name(), name_suffix);
         Self {
             base_symbol,
             granularity,
+            full_name,
         }
     }
 
@@ -23,7 +31,7 @@ impl TimeDimensionSymbol {
     }
 
     pub fn full_name(&self) -> String {
-        self.base_symbol.full_name()
+        self.full_name.clone()
     }
 
     pub fn get_dependencies(&self) -> Vec<Rc<MemberSymbol>> {