Feat: add dtntz date macro variant

Author: georgesittas

sqlmesh/utils/date.py

@@ -253,15 +253,20 @@ def date_dict(
 
     for prefix, time_like in prefixes:
         dt = to_datetime(time_like)
+        dtntz = dt.replace(tzinfo=None)
+
         millis = to_timestamp(time_like)
+
         kwargs[f"{prefix}_dt"] = dt
+        kwargs[f"{prefix}_dtntz"] = dtntz
         kwargs[f"{prefix}_date"] = to_date(dt)
         kwargs[f"{prefix}_ds"] = to_ds(time_like)
         kwargs[f"{prefix}_ts"] = to_ts(dt)
         kwargs[f"{prefix}_tstz"] = to_tstz(dt)
         kwargs[f"{prefix}_epoch"] = millis / 1000
         kwargs[f"{prefix}_millis"] = millis
         kwargs[f"{prefix}_hour"] = dt.hour
+
     return kwargs
 
 

tests/core/test_model.py

@@ -10518,3 +10518,28 @@ def test_boolean_property_validation() -> None:
     )
     model = load_sql_based_model(expressions, dialect="tsql")
     assert model.enabled
+
+
+def test_datetime_without_timezone_variable_redshift() -> None:
+    expressions = d.parse(
+        """
+        MODEL (
+            name test,
+            kind INCREMENTAL_BY_TIME_RANGE (
+                time_column test_time_col,
+                batch_size 1,
+                batch_concurrency 1
+            ),
+            start '2025-06-01',
+            dialect redshift
+        );
+
+        SELECT @start_dtntz AS test_time_col
+        """
+    )
+    model = load_sql_based_model(expressions, dialect="redshift")
+
+    assert (
+        model.render_query_or_raise().sql("redshift")
+        == '''SELECT CAST('1970-01-01 00:00:00' AS TIMESTAMP) AS "test_time_col"'''
+    )

tests/utils/test_date.py

@@ -258,6 +258,10 @@ def test_date_dict():
         "execution_dt": datetime(2020, 1, 2, 1, 0, 0, tzinfo=UTC),
         "start_dt": datetime(2020, 1, 1, 0, 0, 0, tzinfo=UTC),
         "end_dt": datetime(2020, 1, 2, 0, 0, 0, tzinfo=UTC),
+        "latest_dtntz": datetime(2020, 1, 2, 1, 0, 0, tzinfo=None),
+        "execution_dtntz": datetime(2020, 1, 2, 1, 0, 0, tzinfo=None),
+        "start_dtntz": datetime(2020, 1, 1, 0, 0, 0, tzinfo=None),
+        "end_dtntz": datetime(2020, 1, 2, 0, 0, 0, tzinfo=None),
         "latest_date": date(2020, 1, 2),
         "execution_date": date(2020, 1, 2),
         "start_date": date(2020, 1, 1),