Skip to content

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

Allow temporal args for `-` (#67397)

Cam Saul1e4e2b3f7bf5
diff --git a/src/metabase/legacy_mbql/schema.cljc b/src/metabase/legacy_mbql/schema.cljc
index d48d9587552..82b5d00d41e 100644
--- a/src/metabase/legacy_mbql/schema.cljc
+++ b/src/metabase/legacy_mbql/schema.cljc
@@ -681,7 +681,7 @@
more (rest [:ref ::Addable]))
(defclause -
- x [:ref ::NumericExpressionArg]
+ x [:ref ::Addable]
y [:ref ::Addable]
more (rest [:ref ::Addable]))
diff --git a/test/metabase/legacy_mbql/schema_test.cljc b/test/metabase/legacy_mbql/schema_test.cljc
index 780e15d5aeb..62ba22c767c 100644
--- a/test/metabase/legacy_mbql/schema_test.cljc
+++ b/test/metabase/legacy_mbql/schema_test.cljc
@@ -647,3 +647,14 @@
false]]
normalized))
(is (mr/validate schema normalized))))))
+
+(deftest ^:parallel allow-temporal-args-for-minus-test
+ (let [expr ["-"
+ ["date" ["now"]]
+ ["expression" "Last_Date_Active" {"base-type" "type/DateTimeWithLocalTZ"}]]
+ normalized (lib/normalize ::mbql.s/- expr)]
+ (is (= [:-
+ [:date [:now]]
+ [:expression "Last_Date_Active" {:base-type :type/DateTimeWithLocalTZ}]]
+ normalized))
+ (is (mr/validate ::mbql.s/- normalized))))