Add date conversion functions in where clause

Author: Peng Ren

pymongosql/sql/handler.py

@@ -134,6 +134,12 @@ def _parse_value(self, value_text: str) -> Any:
         """Parse string value to appropriate Python type"""
         value_text = value_text.strip()
 
+        # Check if this is a function call (e.g., date('2025-01-01'))
+        if "(" in value_text and ")" in value_text:
+            func_result = self._try_parse_function_value(value_text)
+            if func_result is not None:
+                return func_result
+
         # Remove parentheses from values
         value_text = value_text.strip("()")
 
@@ -159,6 +165,41 @@ def _parse_value(self, value_text: str) -> Any:
 
         return value_text
 
+    def _try_parse_function_value(self, value_text: str) -> Any:
+        """Try to parse a function call like date('2025-01-01') in WHERE condition
+
+        Uses WhereClauseFunctionRegistry to convert string values to MongoDB types.
+        Supported functions: DATE, DATETIME, TIMESTAMP
+        """
+        try:
+            from .where_functions import WhereClauseFunctionRegistry
+
+            registry = WhereClauseFunctionRegistry()
+            func = registry.find_function(value_text)
+
+            if func:
+                # Extract the argument from the function call
+                # For date('2025-01-01'), extract '2025-01-01'
+                column, format_param = func.extract_column_and_format(value_text)
+
+                # Remove quotes from the argument if it's quoted
+                if column and (
+                    (column.startswith("'") and column.endswith("'"))
+                    or (column.startswith('"') and column.endswith('"'))
+                ):
+                    column = column[1:-1]
+
+                # Convert the value using the WHERE clause function
+                if column:
+                    result = func.convert_value(column, format_param)
+                    _logger.debug(f"WHERE function {func.function_name} converted '{column}' to {result}")
+                    return result
+
+            return None
+        except Exception as e:
+            _logger.debug(f"Failed to parse function value '{value_text}': {e}")
+            return None
+
 
 class BaseHandler(ABC):
     """Unified base class for all handlers (expression and visitor)"""

pymongosql/sql/projection_functions.py

@@ -82,7 +82,16 @@ def convert_value(self, value: Any, format_param: Optional[str] = None) -> Any:
                     pass
 
             # Fallback: try common formats
-            for fmt in ["%Y-%m-%dT%H:%M:%SZ", "%Y-%m-%d", "%d-%m-%Y", "%m/%d/%Y"]:
+            # Order matters: try more specific patterns first
+            for fmt in [
+                "%Y-%m-%dT%H:%M:%SZ",  # ISO with time
+                "%Y-%m-%d",  # ISO date
+                "%d/%m/%Y",  # EU format DD/MM/YYYY
+                "%d-%m-%Y",  # EU format DD-MM-YYYY
+                "%d.%m.%Y",  # EU format DD.MM.YYYY
+                "%m/%d/%Y",  # US format MM/DD/YYYY
+                "%m-%d-%Y",  # US format MM-DD-YYYY
+            ]:
                 try:
                     dt = datetime.strptime(value, fmt)
                     return dt.date()
@@ -204,21 +213,24 @@ def convert_value(self, value: Any, format_param: Optional[str] = None) -> Any:
         if isinstance(value, str):
             # Try ISO format first
             try:
-                return datetime.fromisoformat(value)
+                dt = datetime.fromisoformat(value)
+                return dt
             except (ValueError, TypeError):
                 pass
 
             # Try custom format if provided
             if format_param:
                 try:
-                    return datetime.strptime(value, format_param)
+                    dt = datetime.strptime(value, format_param)
+                    return dt
                 except (ValueError, TypeError):
                     pass
 
             # Try common formats
             for fmt in ["%Y-%m-%d %H:%M:%S", "%Y-%m-%dT%H:%M:%SZ", "%Y-%m-%d", "%d-%m-%Y", "%m/%d/%Y"]:
                 try:
-                    return datetime.strptime(value, fmt)
+                    dt = datetime.strptime(value, fmt)
+                    return dt
                 except ValueError:
                     continue