remove copy/paste

Author: KSDaemon

rust/cubesql/cubesql/src/compile/engine/df/scan.rs

@@ -28,6 +28,7 @@ use std::{
     task::{Context, Poll},
 };
 
+use crate::compile::date_parser::parse_date_str;
 use crate::{
     compile::{
         engine::df::wrapper::{CubeScanWrappedSqlNode, CubeScanWrapperNode, SqlQuery},
@@ -38,7 +39,7 @@ use crate::{
     transport::{CubeStreamReceiver, LoadRequestMeta, SpanId, TransportService},
     CubeError,
 };
-use chrono::{Datelike, NaiveDate, NaiveDateTime};
+use chrono::{Datelike, NaiveDate};
 use datafusion::{
     arrow::{
         array::{
@@ -917,15 +918,7 @@ pub fn transform_response<V: ValueObject>(
                     field_name,
                     {
                         (FieldValue::String(s), builder) => {
-                            let timestamp = NaiveDateTime::parse_from_str(s.as_ref(), "%Y-%m-%dT%H:%M:%S%.f")
-                                .or_else(|_| NaiveDateTime::parse_from_str(s.as_ref(), "%Y-%m-%d %H:%M:%S%.f"))
-                                .or_else(|_| NaiveDateTime::parse_from_str(s.as_ref(), "%Y-%m-%dT%H:%M:%S"))
-                                .or_else(|_| NaiveDateTime::parse_from_str(s.as_ref(), "%Y-%m-%dT%H:%M:%S%.fZ"))
-                                .or_else(|_| {
-                                    NaiveDate::parse_from_str(s.as_ref(), "%Y-%m-%d").map(|date| {
-                                        date.and_hms_opt(0, 0, 0).unwrap()
-                                    })
-                                })
+                            let timestamp = parse_date_str(s.as_ref())
                                 .map_err(|e| {
                                     DataFusionError::Execution(format!(
                                         "Can't parse timestamp: '{}': {}",
@@ -959,15 +952,7 @@ pub fn transform_response<V: ValueObject>(
                     field_name,
                     {
                         (FieldValue::String(s), builder) => {
-                            let timestamp = NaiveDateTime::parse_from_str(s.as_ref(), "%Y-%m-%dT%H:%M:%S%.f")
-                                .or_else(|_| NaiveDateTime::parse_from_str(s.as_ref(), "%Y-%m-%d %H:%M:%S%.f"))
-                                .or_else(|_| NaiveDateTime::parse_from_str(s.as_ref(), "%Y-%m-%dT%H:%M:%S"))
-                                .or_else(|_| NaiveDateTime::parse_from_str(s.as_ref(), "%Y-%m-%dT%H:%M:%S%.fZ"))
-                                .or_else(|_| {
-                                    NaiveDate::parse_from_str(s.as_ref(), "%Y-%m-%d").map(|date| {
-                                        date.and_hms_opt(0, 0, 0).unwrap()
-                                    })
-                                })
+                            let timestamp = parse_date_str(s.as_ref())
                                 .map_err(|e| {
                                     DataFusionError::Execution(format!(
                                         "Can't parse timestamp: '{}': {}",

rust/cubesql/cubesql/src/compile/mod.rs

@@ -14,6 +14,7 @@ pub mod service;
 pub mod session;
 
 // Internal API
+mod date_parser;
 pub mod test;
 
 // Re-export for Public API

rust/cubesql/cubesql/src/compile/rewrite/rules/filters.rs

@@ -37,7 +37,7 @@ use chrono::{
         Numeric::{Day, Hour, Minute, Month, Second, Year},
         Pad::Zero,
     },
-    DateTime, Datelike, Days, Duration, Months, NaiveDate, NaiveDateTime, Timelike, Weekday,
+    DateTime, Datelike, Days, Duration, Months, NaiveDateTime, Timelike, Weekday,
 };
 use cubeclient::models::V1CubeMeta;
 use datafusion::{