fix suggestions

Author: KSDaemon

rust/cubesql/cubesql/src/compile/date_parser.rs

@@ -1,12 +1,16 @@
-use chrono::ParseError;
+use crate::compile::engine::df::scan::DataFusionError;
 use chrono::{NaiveDate, NaiveDateTime};
 
-pub fn parse_date_str(s: &str) -> Result<NaiveDateTime, ParseError> {
-    NaiveDateTime::parse_from_str(s, "%Y-%m-%dT%H:%M:%S%.f")
+pub fn parse_date_str(s: &str) -> Result<NaiveDateTime, DataFusionError> {
+    let parsed = NaiveDateTime::parse_from_str(s, "%Y-%m-%dT%H:%M:%S%.f")
         .or_else(|_| NaiveDateTime::parse_from_str(s, "%Y-%m-%d %H:%M:%S%.f"))
         .or_else(|_| NaiveDateTime::parse_from_str(s, "%Y-%m-%dT%H:%M:%S"))
         .or_else(|_| NaiveDateTime::parse_from_str(s, "%Y-%m-%dT%H:%M:%S%.fZ"))
         .or_else(|_| {
             NaiveDate::parse_from_str(s, "%Y-%m-%d").map(|date| date.and_hms_opt(0, 0, 0).unwrap())
-        })
+        });
+
+    parsed.map_err(|e| {
+        DataFusionError::Internal(format!("Can't parse date/time string literal: {}", e))
+    })
 }

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

@@ -4631,18 +4631,14 @@ impl FilterRules {
                             }
 
                             let mut result = Vec::new();
-                            let resolved_start_date = if let Some(rtd) =
+                            let Some(resolved_start_date) =
                                 resolve_time_delta(&date_range_start[0], date_range_start_op)
-                            {
-                                rtd
-                            } else {
+                            else {
                                 return false;
                             };
-                            let resolved_end_date = if let Some(rtd) =
+                            let Some(resolved_end_date) =
                                 resolve_time_delta(&date_range_end[0], date_range_end_op)
-                            {
-                                rtd
-                            } else {
+                            else {
                                 return false;
                             };