Skip to content

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

Add missing multimethods for datetime-subtract (#69324)

metamben3c774eccc8eb
diff --git a/src/metabase/lib/expression.cljc b/src/metabase/lib/expression.cljc
index 27639d5fcf9..d06c1b89304 100644
--- a/src/metabase/lib/expression.cljc
+++ b/src/metabase/lib/expression.cljc
@@ -236,6 +236,18 @@
\_
(interval-column-name amount unit)))
+(defmethod lib.metadata.calculation/display-name-method :datetime-subtract
+ [query stage-number [_datetime-subtract _opts x amount unit] style]
+ (str (lib.metadata.calculation/display-name query stage-number x style)
+ \space
+ (interval-display-name (clojure.core/- amount) unit)))
+
+(defmethod lib.metadata.calculation/column-name-method :datetime-subtract
+ [query stage-number [_datetime-subtract _opts x amount unit]]
+ (str (lib.metadata.calculation/column-name query stage-number x)
+ \_
+ (interval-column-name (clojure.core/- amount) unit)))
+
;;; for now we'll just pretend `:coalesce` isn't a present and just use the display name for the expr it wraps.
(defmethod lib.metadata.calculation/display-name-method :coalesce
[query stage-number [_coalesce _opts expr _null-expr] style]
diff --git a/test/metabase/lib/expression_test.cljc b/test/metabase/lib/expression_test.cljc
index 2846a566323..e0feeb38762 100644
--- a/test/metabase/lib/expression_test.cljc
+++ b/test/metabase/lib/expression_test.cljc
@@ -126,6 +126,17 @@
(is (= "Date - 1 day"
(lib/display-name (lib.tu/venues-query) -1 clause)))))
+(deftest ^:parallel datetime-subtract-names-test
+ (let [clause [:datetime-subtract
+ {}
+ (lib.tu/field-clause :checkins :date {:base-type :type/Date})
+ 1
+ :day]]
+ (is (= "DATE_minus_1_day"
+ (lib/column-name (lib.tu/venues-query) -1 clause)))
+ (is (= "Date - 1 day"
+ (lib/display-name (lib.tu/venues-query) -1 clause)))))
+
(deftest ^:parallel expression-reference-names-test
(let [query (-> (lib.tu/venues-query)
(lib/expression "double-price"