Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Honor report-timezone in SQL Server for time ranges (#79271)

metambenf1613d8e2eee
diff --git a/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj b/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
index 474165bf8e2..6b508814436 100644
--- a/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
+++ b/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
@@ -541,6 +541,44 @@
(defmethod sql.qp/datetime-diff [:sqlserver :minute] [_driver _unit x y] (date-diff :minute x y))
(defmethod sql.qp/datetime-diff [:sqlserver :second] [_driver _unit x y] (date-diff :second x y))
+(defn- comparison-lhs-datetimeoffset?
+ "True when [[sql.qp/*parent-honeysql-col-type-info*]] indicates the LHS of the enclosing comparison is a
+ `datetimeoffset` column."
+ [parent-info]
+ (or (= "datetimeoffset" (:database-type parent-info))
+ (isa? (:effective-type parent-info) :type/DateTimeWithZoneOffset)
+ (isa? (:base-type parent-info) :type/DateTimeWithZoneOffset)))
+
+(defn- maybe-attach-report-timezone
+ "Wrap `rhs` in `AT TIME ZONE '<report-tz-windows-name>'` when:
+
+ - the LHS of the enclosing comparison is a `datetimeoffset` column,
+ - a report timezone is configured, and
+ - `rhs` is a naive `datetime`/`datetime2` (nothing to preserve).
+
+ Otherwise return `rhs` unchanged. This restores the report-timezone offset that date bucketing drops.
+ Without it, SQL Server implicitly treats a naive `datetime2` as offset +00:00 when comparing against
+ `datetimeoffset`, shifting the filter window by the report tz offset (#78612)."
+ [rhs]
+ (let [report-windows-tz (some-> (driver-api/requested-timezone-id) zone-id->windows-zone)
+ rhs-naive? (contains? #{"datetime" "datetime2"}
+ (h2x/type-info->db-type (h2x/type-info rhs)))]
+ (cond-> rhs
+ (and report-windows-tz
+ rhs-naive?
+ (comparison-lhs-datetimeoffset? sql.qp/*parent-honeysql-col-type-info*))
+ (h2x/at-time-zone report-windows-tz))))
+
+(defmethod sql.qp/->honeysql [:sqlserver :relative-datetime]
+ [driver clause]
+ (maybe-attach-report-timezone
+ ((get-method sql.qp/->honeysql [:sql :relative-datetime]) driver clause)))
+
+(defmethod sql.qp/->honeysql [:sqlserver :absolute-datetime]
+ [driver clause]
+ (maybe-attach-report-timezone
+ ((get-method sql.qp/->honeysql [:sql :absolute-datetime]) driver clause)))
+
(defmethod sql.qp/cast-temporal-string [:sqlserver :Coercion/ISO8601->DateTime]
[_driver _semantic_type expr]
(h2x/->datetime expr))
diff --git a/modules/drivers/sqlserver/test/metabase/driver/sqlserver_test.clj b/modules/drivers/sqlserver/test/metabase/driver/sqlserver_test.clj
index e9ea8f31ff9..ac51a773683 100644
--- a/modules/drivers/sqlserver/test/metabase/driver/sqlserver_test.clj
+++ b/modules/drivers/sqlserver/test/metabase/driver/sqlserver_test.clj
@@ -45,6 +45,75 @@
(is (= ["TIMEFROMPARTS(DATEPART(hour, \"test_col\"), 0, 0, 0, 0)"]
(sql.qp/format-honeysql :sqlserver (sql.qp/date :sqlserver :hour expr)))))))
+(deftest relative-datetime-against-datetimeoffset-uses-report-timezone-test
+ (testing (str "When a `:relative-datetime` filter value is compared against a `datetimeoffset` column, the value "
+ "must be tagged with the report timezone. Otherwise SQL Server implicitly treats the naive "
+ "`datetime2` result as offset +00:00 during the comparison, shifting the filter window by the "
+ "report tz offset (#78612).")
+ (driver/with-driver :sqlserver
+ (qp.test-util/with-report-timezone-id! "Pacific/Auckland"
+ (let [today [:relative-datetime {:lib/uuid (str (random-uuid))} 0 :day]
+ tomorrow [:relative-datetime {:lib/uuid (str (random-uuid))} 1 :day]]
+ (testing "datetimeoffset LHS: RHS is wrapped in AT TIME ZONE '<report-tz-windows-name>'"
+ (binding [sql.qp/*parent-honeysql-col-type-info* {:database-type "datetimeoffset"
+ :effective-type :type/DateTimeWithZoneOffset}]
+ (is (= [(str "(CAST(DATEFROMPARTS(YEAR(GETDATE()), MONTH(GETDATE()), DAY(GETDATE())) AS datetime2)"
+ " AT TIME ZONE 'New Zealand Standard Time')")]
+ (sql.qp/format-honeysql :sqlserver (sql.qp/->honeysql :sqlserver today))))
+ (is (= [(str "(CAST(DATEFROMPARTS(YEAR(DATEADD(day, 1, GETDATE())),"
+ " MONTH(DATEADD(day, 1, GETDATE())),"
+ " DAY(DATEADD(day, 1, GETDATE()))) AS datetime2)"
+ " AT TIME ZONE 'New Zealand Standard Time')")]
+ (sql.qp/format-honeysql :sqlserver (sql.qp/->honeysql :sqlserver tomorrow))))))
+ (testing "plain datetime2 LHS: RHS is unchanged (no AT TIME ZONE wrap)"
+ (binding [sql.qp/*parent-honeysql-col-type-info* {:database-type "datetime2"
+ :effective-type :type/DateTime}]
+ (is (= ["CAST(DATEFROMPARTS(YEAR(GETDATE()), MONTH(GETDATE()), DAY(GETDATE())) AS datetime2)"]
+ (sql.qp/format-honeysql :sqlserver (sql.qp/->honeysql :sqlserver today))))))))
+ (testing "with no report timezone set, RHS is unchanged even for a datetimeoffset LHS (nothing to attach)"
+ (qp.test-util/with-report-timezone-id! nil
+ (binding [sql.qp/*parent-honeysql-col-type-info* {:database-type "datetimeoffset"
+ :effective-type :type/DateTimeWithZoneOffset}]
+ (is (= ["CAST(DATEFROMPARTS(YEAR(GETDATE()), MONTH(GETDATE()), DAY(GETDATE())) AS datetime2)"]
+ (sql.qp/format-honeysql
+ :sqlserver
+ (sql.qp/->honeysql :sqlserver
+ [:relative-datetime {:lib/uuid (str (random-uuid))} 0 :day]))))))))))
+
+(deftest absolute-datetime-against-datetimeoffset-uses-report-timezone-test
+ (testing (str "`:absolute-datetime` filter values compared against a `datetimeoffset` column suffer the same "
+ "class of bug as `:relative-datetime` (#78612): a naive `datetime2` RHS is silently treated as "
+ "offset +00:00 during the comparison. Attach the report timezone to the naive literal.")
+ (driver/with-driver :sqlserver
+ (let [today [:absolute-datetime {:lib/uuid (str (random-uuid))} (t/local-date 2026 8 2) :day]]
+ (qp.test-util/with-report-timezone-id! "Pacific/Auckland"
+ (testing "datetimeoffset LHS: RHS is wrapped in AT TIME ZONE '<report-tz-windows-name>'"
+ (binding [sql.qp/*parent-honeysql-col-type-info* {:database-type "datetimeoffset"
+ :effective-type :type/DateTimeWithZoneOffset}]
+ (is (= [(str "(CAST(DATEFROMPARTS(YEAR(?), MONTH(?), DAY(?)) AS datetime2)"
+ " AT TIME ZONE 'New Zealand Standard Time')")
+ (t/local-date 2026 8 2)
+ (t/local-date 2026 8 2)
+ (t/local-date 2026 8 2)]
+ (sql.qp/format-honeysql :sqlserver (sql.qp/->honeysql :sqlserver today))))))
+ (testing "plain datetime2 LHS: RHS is unchanged (no AT TIME ZONE wrap)"
+ (binding [sql.qp/*parent-honeysql-col-type-info* {:database-type "datetime2"
+ :effective-type :type/DateTime}]
+ (is (= ["CAST(DATEFROMPARTS(YEAR(?), MONTH(?), DAY(?)) AS datetime2)"
+ (t/local-date 2026 8 2)
+ (t/local-date 2026 8 2)
+ (t/local-date 2026 8 2)]
+ (sql.qp/format-honeysql :sqlserver (sql.qp/->honeysql :sqlserver today)))))))
+ (testing "with no report timezone set, RHS is unchanged even for a datetimeoffset LHS (nothing to attach)"
+ (qp.test-util/with-report-timezone-id! nil
+ (binding [sql.qp/*parent-honeysql-col-type-info* {:database-type "datetimeoffset"
+ :effective-type :type/DateTimeWithZoneOffset}]
+ (is (= ["CAST(DATEFROMPARTS(YEAR(?), MONTH(?), DAY(?)) AS datetime2)"
+ (t/local-date 2026 8 2)
+ (t/local-date 2026 8 2)
+ (t/local-date 2026 8 2)]
+ (sql.qp/format-honeysql :sqlserver (sql.qp/->honeysql :sqlserver today)))))))))))
+
(deftest ^:parallel fix-order-bys-test
(testing "Remove order-by from joins"
(let [original [{:joins [{:alias "C3"