make exclusive ts instead of between patch

Author: eakmanrq

sqlmesh/core/renderer.py

@@ -16,7 +16,14 @@
 from sqlmesh.core import constants as c
 from sqlmesh.core import dialect as d
 from sqlmesh.core.macros import MacroEvaluator, RuntimeStage
-from sqlmesh.utils.date import TimeLike, date_dict, make_inclusive, to_datetime
+from sqlmesh.utils.date import (
+    TimeLike,
+    date_dict,
+    make_inclusive,
+    to_datetime,
+    make_ts_exclusive,
+    to_tstz,
+)
 from sqlmesh.utils.errors import (
     ConfigError,
     ParsetimeAdapterCallError,
@@ -213,7 +220,9 @@ def _resolve_table(table: str | exp.Table) -> str:
         for ref in all_refs:
             if ref.event_time_filter:
                 ref.event_time_filter["start"] = render_kwargs["start_tstz"]
-                ref.event_time_filter["end"] = render_kwargs["end_tstz"]
+                ref.event_time_filter["end"] = to_tstz(
+                    make_ts_exclusive(render_kwargs["end_tstz"], dialect=self._dialect)
+                )
         jinja_env = self._jinja_macro_registry.build_environment(**jinja_env_kwargs)
 
         expressions = [self._expression]

sqlmesh/dbt/__init__.py

@@ -2,25 +2,3 @@
     create_builtin_filters as create_builtin_filters,
     create_builtin_globals as create_builtin_globals,
 )
-from sqlmesh.dbt.util import DBT_VERSION
-
-
-if DBT_VERSION >= (1, 9, 0):
-    from dbt.adapters.base.relation import BaseRelation, EventTimeFilter
-
-    def _render_event_time_filtered_inclusive(
-        self: BaseRelation, event_time_filter: EventTimeFilter
-    ) -> str:
-        """
-        Returns "" if start and end are both None
-        """
-        filter = ""
-        if event_time_filter.start and event_time_filter.end:
-            filter = f"{event_time_filter.field_name} BETWEEN '{event_time_filter.start}' and '{event_time_filter.end}'"
-        elif event_time_filter.start:
-            filter = f"{event_time_filter.field_name} >= '{event_time_filter.start}'"
-        elif event_time_filter.end:
-            filter = f"{event_time_filter.field_name} <= '{event_time_filter.end}'"
-        return filter
-
-    BaseRelation._render_event_time_filtered = _render_event_time_filtered_inclusive  # type: ignore

sqlmesh/utils/date.py

@@ -343,6 +343,13 @@ def make_exclusive(time: TimeLike) -> datetime:
     return dt
 
 
+def make_ts_exclusive(time: TimeLike, dialect: DialectType) -> datetime:
+    ts = to_datetime(time)
+    if dialect == "tsql":
+        return to_utc_timestamp(ts) - pd.Timedelta(1, unit="ns")
+    return ts + timedelta(microseconds=1)
+
+
 def to_utc_timestamp(time: datetime) -> pd.Timestamp:
     import pandas as pd
 

tests/dbt/test_model.py

@@ -358,11 +358,11 @@ def test_load_microbatch_with_ref(
     context = Context(paths=project_dir)
     assert (
         context.render(microbatch_snapshot_fqn, start="2025-01-01", end="2025-01-10").sql()
-        == 'SELECT "cola" AS "cola", "ds" AS "ds" FROM (SELECT * FROM "local"."my_source"."my_table" AS "my_table" WHERE "ds" BETWEEN \'2025-01-01 00:00:00+00:00\' AND \'2025-01-10 23:59:59.999999+00:00\') AS "_q_0"'
+        == 'SELECT "cola" AS "cola", "ds" AS "ds" FROM (SELECT * FROM "local"."my_source"."my_table" AS "my_table" WHERE "ds" >= \'2025-01-01 00:00:00+00:00\' AND "ds" < \'2025-01-11 00:00:00+00:00\') AS "_q_0"'
     )
     assert (
         context.render(microbatch_two_snapshot_fqn, start="2025-01-01", end="2025-01-10").sql()
-        == 'SELECT "_q_0"."cola" AS "cola", "_q_0"."ds" AS "ds" FROM (SELECT "microbatch"."cola" AS "cola", "microbatch"."ds" AS "ds" FROM "local"."main"."microbatch" AS "microbatch" WHERE "microbatch"."ds" <= \'2025-01-10 23:59:59.999999+00:00\' AND "microbatch"."ds" >= \'2025-01-01 00:00:00+00:00\') AS "_q_0"'
+        == 'SELECT "_q_0"."cola" AS "cola", "_q_0"."ds" AS "ds" FROM (SELECT "microbatch"."cola" AS "cola", "microbatch"."ds" AS "ds" FROM "local"."main"."microbatch" AS "microbatch" WHERE "microbatch"."ds" < \'2025-01-11 00:00:00+00:00\' AND "microbatch"."ds" >= \'2025-01-01 00:00:00+00:00\') AS "_q_0"'
     )