implement baseQuery's dimensionTimeGroupedColumn() in Granularity object

Author: KSDaemon

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_templates/plan.rs

@@ -62,6 +62,15 @@ impl PlanSqlTemplates {
             .time_grouped_column(granularity, dimension)
     }
 
+    pub fn date_bin(
+        &self,
+        interval: String,
+        source: String,
+        origin: String,
+    ) -> Result<String, CubeError> {
+        self.driver_tools.date_bin(interval, source, origin)
+    }
+
     pub fn timestamp_precision(&self) -> Result<u32, CubeError> {
         self.driver_tools.timestamp_precision()
     }
@@ -121,14 +130,6 @@ impl PlanSqlTemplates {
         self.driver_tools.count_distinct_approx(sql)
     }
 
-    pub fn date_bin(
-        &self,
-        interval: String,
-        source: String,
-        origin: String,
-    ) -> Result<String, CubeError> {
-        self.driver_tools.date_bin(interval, source, origin)
-    }
     pub fn alias_name(name: &str) -> String {
         let res = name
             .with_boundaries(&[

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

@@ -1,5 +1,6 @@
 use super::{GranularityHelper, QueryDateTime, SqlInterval};
 use crate::planner::sql_evaluator::SqlCall;
+use crate::planner::sql_templates::PlanSqlTemplates;
 use chrono_tz::Tz;
 use cubenativeutils::CubeError;
 use itertools::Itertools;
@@ -166,4 +167,29 @@ impl Granularity {
     fn default_origin(timezone: Tz) -> Result<QueryDateTime, CubeError> {
         Ok(QueryDateTime::now(timezone)?.start_of_year())
     }
+
+    pub fn apply_to_input_sql(
+        &self,
+        templates: &PlanSqlTemplates,
+        input: String,
+    ) -> Result<String, CubeError> {
+        let res = if self.is_natural_aligned {
+            if let Some(offset) = &self.granularity_offset {
+                let mut res = templates.subtract_interval(input.clone(), offset.clone())?;
+                res = templates.time_grouped_column(self.granularity_from_interval()?, res)?;
+                res = templates.add_interval(res, offset.clone())?;
+                res
+            } else {
+                templates.time_grouped_column(self.granularity_from_interval()?, input)?
+            }
+        } else {
+            templates.date_bin(
+                self.granularity_interval.clone(),
+                input,
+                self.origin_local_formatted(),
+            )?
+        };
+
+        Ok(res)
+    }
 }