chore: fix

Author: ovr

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

@@ -1,17 +1,19 @@
-use chrono::{DateTime, Duration, LocalResult, NaiveDate, NaiveDateTime, TimeZone};
+use chrono::{DateTime, Duration, LocalResult, NaiveDateTime, TimeZone};
 use chrono_tz::Tz;
 use cubenativeutils::CubeError;
+use lazy_static::lazy_static;
 use regex::Regex;
+
 pub struct QueryDateTimeHelper {}
 
-use lazy_static::lazy_static;
 lazy_static! {
     static ref DATE_TIME_LOCAL_MS_RE: Regex =
         Regex::new(r"^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\d$").unwrap();
     static ref DATE_TIME_LOCAL_U_RE: Regex =
         Regex::new(r"^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\d\d\d\d$").unwrap();
     static ref DATE_RE: Regex = Regex::new(r"^\d\d\d\d-\d\d-\d\d$").unwrap();
 }
+
 impl QueryDateTimeHelper {
     pub fn parse_native_date_time(date: &str) -> Result<NaiveDateTime, CubeError> {
         let formats = &[
@@ -28,8 +30,9 @@ impl QueryDateTimeHelper {
             }
         }
 
-        if let Ok(d) = NaiveDate::parse_from_str(date, "%Y-%m-%d") {
-            return Ok(d.and_hms_opt(0, 0, 0).unwrap());
+        // Fallback as RFC3339/ISO8601 with 'Z' timezone
+        if let Ok(dt) = DateTime::parse_from_rfc3339(date) {
+            return Ok(dt.naive_utc());
         }
 
         Err(CubeError::user(format!("Can't parse date: '{}'", date)))
@@ -153,6 +156,8 @@ impl QueryDateTimeHelper {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use chrono::NaiveDate;
+
     #[test]
     fn test_parse_native_date_time() {
         assert_eq!(
@@ -190,5 +195,20 @@ mod tests {
                 .and_hms_milli_opt(12, 10, 15, 345)
                 .unwrap()
         );
+        // Test parsing with 'Z' timezone (UTC)
+        assert_eq!(
+            QueryDateTimeHelper::parse_native_date_time("2024-01-01T10:15:00Z").unwrap(),
+            NaiveDate::from_ymd_opt(2024, 1, 1)
+                .unwrap()
+                .and_hms_opt(10, 15, 0)
+                .unwrap()
+        );
+        assert_eq!(
+            QueryDateTimeHelper::parse_native_date_time("2024-01-01T10:15:00.123Z").unwrap(),
+            NaiveDate::from_ymd_opt(2024, 1, 1)
+                .unwrap()
+                .and_hms_milli_opt(10, 15, 0, 123)
+                .unwrap()
+        );
     }
 }

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

@@ -1,7 +1,7 @@
 use crate::cube_bridge::evaluator::CubeEvaluator;
 use crate::planner::sql_evaluator::Compiler;
 use crate::planner::sql_evaluator::TimeDimensionSymbol;
-use crate::planner::Granularity;
+use crate::planner::{Granularity, QueryDateTimeHelper};
 use chrono::prelude::*;
 use chrono_tz::Tz;
 use cubenativeutils::CubeError;
@@ -200,25 +200,7 @@ impl GranularityHelper {
     }
 
     pub fn parse_date_time(date: &str) -> Result<NaiveDateTime, CubeError> {
-        let formats = &[
-            "%Y-%m-%d",
-            "%Y-%m-%d %H:%M:%S%.f",
-            "%Y-%m-%d %H:%M:%S",
-            "%Y-%m-%dT%H:%M:%S%.f",
-            "%Y-%m-%dT%H:%M:%S",
-        ];
-
-        for format in formats {
-            if let Ok(dt) = NaiveDateTime::parse_from_str(date, format) {
-                return Ok(dt);
-            }
-        }
-
-        if let Ok(d) = NaiveDate::parse_from_str(date, "%Y-%m-%d") {
-            return Ok(d.and_hms_opt(0, 0, 0).unwrap());
-        }
-
-        Err(CubeError::user(format!("Can't parse date: '{}'", date)))
+        QueryDateTimeHelper::parse_native_date_time(date)
     }
 
     pub fn make_granularity_obj(