Skip to content

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

Use calendar days for bigquery datetimeDiff (#82194)

Riley Thompson05d2f186a058
diff --git a/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk/query_processor.clj b/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk/query_processor.clj
index 38807cc5edb..9527ecd48d6 100644
--- a/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk/query_processor.clj
+++ b/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk/query_processor.clj
@@ -772,7 +772,10 @@
(defmethod sql.qp/datetime-diff [:bigquery-cloud-sdk :day]
[_driver _unit x y]
- (timestamp-diff :day (trunc :day x) (trunc :day y)))
+ ;; Use `DATE_DIFF` over `TIMESTAMP_DIFF` so that we count calendar days instead of 24-hour periods,
+ ;; to handle DST transitions correctly (#82193).
+ (let [->date (get-method ->temporal-type :default)]
+ [:date_diff (->date :date y) (->date :date x) :'day]))
(defmethod sql.qp/datetime-diff [:bigquery-cloud-sdk :hour] [_driver _unit x y] (timestamp-diff :hour x y))
(defmethod sql.qp/datetime-diff [:bigquery-cloud-sdk :minute] [_driver _unit x y] (timestamp-diff :minute x y))
diff --git a/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/query_processor_test.clj b/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/query_processor_test.clj
index 8ced273c2a7..baf49f60549 100644
--- a/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/query_processor_test.clj
+++ b/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk/query_processor_test.clj
@@ -569,6 +569,26 @@
(t/local-date-time "2019-11-11T12:00:00")
(t/local-date-time "2019-11-12T12:00:00")]))))))))))
+(deftest datetime-diff-day-test
+ (mt/test-driver :bigquery-cloud-sdk
+ (mt/with-report-timezone-id! "America/Los_Angeles"
+ (let [mp (mt/metadata-provider)
+ query (-> (lib/query mp (lib.metadata/table mp (mt/id :products)))
+ (lib/join (lib/join-clause
+ (lib.metadata/table mp (mt/id :orders))
+ [(lib/= (lib.metadata/field mp (mt/id :products :id))
+ (lib.metadata/field mp (mt/id :orders :product_id)))]))
+ (lib/expression "daydiff"
+ (lib/expression-clause
+ :datetime-diff
+ [(lib.metadata/field mp (mt/id :products :created_at))
+ (lib.metadata/field mp (mt/id :orders :created_at))
+ :day]
+ nil)))
+ query (lib/aggregate query (lib/sum (lib/expression-ref query "daydiff")))]
+ (is (= [[7555207]]
+ (mt/formatted-rows [int] (qp/process-query query))))))))
+
(defn- do-with-datetime-timestamp-table [f]
(driver/with-driver :bigquery-cloud-sdk
(let [table-name (format "table_%s" (mt/random-name))]