Fix: time format filtering for dates and timestamp (#1599)

Author: tobymao

sqlmesh/core/model/definition.py

@@ -34,7 +34,7 @@
 from sqlmesh.core.model.seed import CsvSeedReader, Seed, create_seed
 from sqlmesh.core.renderer import ExpressionRenderer, QueryRenderer
 from sqlmesh.utils import str_to_bool
-from sqlmesh.utils.date import TimeLike, make_inclusive, to_datetime
+from sqlmesh.utils.date import TimeLike, make_inclusive, to_datetime, to_ds, to_ts
 from sqlmesh.utils.errors import ConfigError, SQLMeshError, raise_config_error
 from sqlmesh.utils.hashing import hash_data
 from sqlmesh.utils.jinja import JinjaMacroRegistry, extract_macro_references
@@ -514,9 +514,6 @@ def convert_to_time_column(
     ) -> exp.Expression:
         """Convert a TimeLike object to the same time format and type as the model's time column."""
         if self.time_column:
-            if self.time_column.format:
-                time = to_datetime(time).strftime(self.time_column.format)
-
             if columns_to_types is None:
                 columns_to_types = self.columns_to_types_or_raise
 
@@ -526,12 +523,18 @@ def convert_to_time_column(
                 )
 
             time_column_type = columns_to_types[self.time_column.column]
+
+            if time_column_type.is_type(exp.DataType.Type.DATE):
+                return exp.cast(exp.Literal.string(to_ds(time)), to="date")
+            if time_column_type.this in exp.DataType.TEMPORAL_TYPES:
+                return exp.cast(exp.Literal.string(to_ts(time)), to=time_column_type.this)
+
+            if self.time_column.format:
+                time = to_datetime(time).strftime(self.time_column.format)
             if time_column_type.this in exp.DataType.TEXT_TYPES:
                 return exp.Literal.string(time)
-            elif time_column_type.this in exp.DataType.NUMERIC_TYPES:
+            if time_column_type.this in exp.DataType.NUMERIC_TYPES:
                 return exp.Literal.number(time)
-            elif time_column_type.this in exp.DataType.TEMPORAL_TYPES:
-                return exp.cast(exp.Literal.string(time), time_column_type)
         return exp.convert(time)
 
     def update_schema(

tests/core/test_model.py

@@ -1215,7 +1215,24 @@ def test_convert_to_time_column():
     """
     )
     model = load_sql_based_model(expressions)
-    assert model.convert_to_time_column("2022-01-01") == d.parse_one("CAST('20220101' AS date)")
+    assert model.convert_to_time_column("2022-01-01") == d.parse_one("CAST('2022-01-01' AS DATE)")
+
+    expressions = d.parse(
+        """
+        MODEL (
+            name db.table,
+            kind INCREMENTAL_BY_TIME_RANGE(
+                time_column ds
+            )
+        );
+
+        SELECT ds::timestamp
+    """
+    )
+    model = load_sql_based_model(expressions)
+    assert model.convert_to_time_column("2022-01-01") == d.parse_one(
+        "CAST('2022-01-01T00:00:00+00:00' AS TIMESTAMP)"
+    )
 
 
 def test_parse(assert_exp_eq):