The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Fix default tag values for temporal template tags (#65112)
William82ea0f4f7ea2
diff --git a/src/metabase/lib/native.cljc b/src/metabase/lib/native.cljcindex 05da6e4598f..0fda1bc8a15 100644--- a/src/metabase/lib/native.cljc+++ b/src/metabase/lib/native.cljc@@ -7,11 +7,11 @@[clojure.string :as str][medley.core :as m][metabase.lib.metadata :as lib.metadata]- [metabase.lib.options :as lib.options][metabase.lib.parameters.parse :as lib.params.parse][metabase.lib.parameters.parse.types :as lib.params.parse.types][metabase.lib.parse :as lib.parse][metabase.lib.query :as lib.query]+ [metabase.lib.ref :as lib.ref][metabase.lib.schema :as lib.schema][metabase.lib.schema.common :as common][metabase.lib.schema.id :as lib.schema.id]@@ -387,7 +387,7 @@(:engine (lib.metadata/database query)))(defn- get-parameter-value- [tag-name {:keys [id dimension], param-type :type}]+ [query tag-name {:keys [id dimension], param-type :type}];; note that the actual values chosen are completely arbitrary. We just need to provide some;; value so that the query will compile.(case param-type@@ -407,13 +407,20 @@:type :boolean/=,:value [false],:target ["variable" ["template-tag" tag-name]]}- :dimension (merge {:id id,- :type :string/=,- :value ["foo"],- :target ["dimension" ["template-tag" tag-name]]}- (when (isa? (-> dimension lib.options/options :effective-type) :type/Number)- {:type :number/=,- :value ["0"]}))+ :dimension (let [effective-type (->> dimension+ lib.ref/field-ref-id+ (lib.metadata/field query)+ :effective-type)]+ (merge {:id id,+ :type :string/=,+ :value ["foo"],+ :target ["dimension" ["template-tag" tag-name]]}+ (when (isa? effective-type :type/Number)+ {:type :number/=,+ :value ["0"]})+ (when (isa? effective-type :type/HasDate)+ {:type :date/single+ :value "2025-01-01"}))):temporal-unit {:id id,:type :temporal-unit,:value "week",@@ -431,7 +438,7 @@new-parameters (into [](keep (fn [[tag-name {:keys [id] :as tag}]](or (params-by-id id)- (get-parameter-value tag-name tag))))+ (get-parameter-value query tag-name tag))))ttags)](cond-> querydiff --git a/test/metabase/lib/native_test.cljc b/test/metabase/lib/native_test.cljcindex 84f45cc177f..61cd6943971 100644--- a/test/metabase/lib/native_test.cljc+++ b/test/metabase/lib/native_test.cljc@@ -464,3 +464,129 @@:display-name "Price":lib/source :source/card}](lib/returned-columns query)))))++(deftest ^:parallel add-parameters-text-tag-test+ (is (= [{:id "9ae1ea5e-ac33-4574-bc95-ff595b0ac1a7",+ :type :string/=,+ :value ["foo"],+ :target ["variable" ["template-tag" "mytag"]]}]+ (-> (lib/native-query meta/metadata-provider "select * from venues where {{mytag}}")+ (lib/with-template-tags {"mytag" {:type :text,+ :name "mytag",+ :id "9ae1ea5e-ac33-4574-bc95-ff595b0ac1a7"+ :display-name "My Tag"}})+ lib/add-parameters-for-template-tags+ :parameters))))++(deftest ^:parallel add-parameters-number-tag-test+ (is (= [{:id "9ae1ea5e-ac33-4574-bc95-ff595b0ac1a7",+ :type :number/=,+ :value ["0"],+ :target ["variable" ["template-tag" "mytag"]]}]+ (-> (lib/native-query meta/metadata-provider "select * from venues where {{mytag}}")+ (lib/with-template-tags {"mytag"+ {:display-name "My Tag"+ :id "9ae1ea5e-ac33-4574-bc95-ff595b0ac1a7"+ :name "mytag"+ :type :number}})+ lib/add-parameters-for-template-tags+ :parameters))))++(deftest ^:parallel add-parameters-date-tag-test+ (is (= [{:id "9ae1ea5e-ac33-4574-bc95-ff595b0ac1a7",+ :type :date/single,+ :value "1970-01-01",+ :target ["variable" ["template-tag" "mytag"]]}]+ (-> (lib/native-query meta/metadata-provider "select * from venues where {{mytag}}")+ (lib/with-template-tags {"mytag"+ {:display-name "My Tag"+ :id "9ae1ea5e-ac33-4574-bc95-ff595b0ac1a7"+ :name "mytag"+ :type :date}})+ lib/add-parameters-for-template-tags+ :parameters))))++(deftest ^:parallel add-parameters-boolean-tag-test+ (is (= [{:id "9ae1ea5e-ac33-4574-bc95-ff595b0ac1a7",+ :type :boolean/=,+ :value [false],+ :target ["variable" ["template-tag" "mytag"]]}]+ (-> (lib/native-query meta/metadata-provider "select * from venues where {{mytag}}")+ (lib/with-template-tags {"mytag"+ {:display-name "My Tag"+ :id "9ae1ea5e-ac33-4574-bc95-ff595b0ac1a7"+ :name "mytag"+ :type :boolean}})+ lib/add-parameters-for-template-tags+ :parameters))))++(deftest ^:parallel add-parameters-string-dimension-tag-test+ (is (= [{:id "9ae1ea5e-ac33-4574-bc95-ff595b0ac1a7",+ :type :string/=,+ :value ["foo"],+ :target ["dimension" ["template-tag" "mytag"]]}]+ (-> (lib/native-query meta/metadata-provider "select * from venues where {{mytag}}")+ (lib/with-template-tags {"mytag"+ {:dimension [:field+ {:lib/uuid "a9e2b665-cadd-4d25-b1c1-09ca8f1736cf"}+ (meta/id :products :category)]+ :display-name "My Tag"+ :id "9ae1ea5e-ac33-4574-bc95-ff595b0ac1a7"+ :name "mytag"+ :type :dimension+ :widget-type :date/range}})+ lib/add-parameters-for-template-tags+ :parameters))))++(deftest ^:parallel add-parameters-number-dimension-tag-test+ (is (= [{:id "9ae1ea5e-ac33-4574-bc95-ff595b0ac1a7",+ :type :number/=,+ :value ["0"],+ :target ["dimension" ["template-tag" "mytag"]]}]+ (-> (lib/native-query meta/metadata-provider "select * from venues where {{mytag}}")+ (lib/with-template-tags {"mytag"+ {:dimension [:field+ {:lib/uuid "a9e2b665-cadd-4d25-b1c1-09ca8f1736cf"}+ (meta/id :orders :total)]+ :display-name "My Tag"+ :id "9ae1ea5e-ac33-4574-bc95-ff595b0ac1a7"+ :name "mytag"+ :type :dimension+ :widget-type :date/range}})+ lib/add-parameters-for-template-tags+ :parameters))))++(deftest ^:parallel add-parameters-date-dimension-tag-test+ (is (= [{:id "9ae1ea5e-ac33-4574-bc95-ff595b0ac1a7",+ :type :date/single,+ :value "2025-01-01",+ :target ["dimension" ["template-tag" "mytag"]]}]+ (-> (lib/native-query meta/metadata-provider "select * from venues where {{mytag}}")+ (lib/with-template-tags {"mytag"+ {:dimension [:field+ {:lib/uuid "a9e2b665-cadd-4d25-b1c1-09ca8f1736cf"}+ (meta/id :orders :created-at)]+ :display-name "My Tag"+ :id "9ae1ea5e-ac33-4574-bc95-ff595b0ac1a7"+ :name "mytag"+ :type :dimension+ :widget-type :date/range}})+ lib/add-parameters-for-template-tags+ :parameters))))++(deftest ^:parallel add-parameters-temporal-unit-tag-test+ (is (= [{:id "9ae1ea5e-ac33-4574-bc95-ff595b0ac1a7",+ :type :temporal-unit,+ :value "week",+ :target ["dimension" ["template-tag" "mytag"]]}]+ (-> (lib/native-query meta/metadata-provider "select * from venues where {{mytag}}")+ (lib/with-template-tags {"mytag"+ {:dimension [:field+ {:lib/uuid "a9e2b665-cadd-4d25-b1c1-09ca8f1736cf"}+ (meta/id :orders :created-at)]+ :display-name "My Tag"+ :id "9ae1ea5e-ac33-4574-bc95-ff595b0ac1a7"+ :name "mytag"+ :type :temporal-unit}})+ lib/add-parameters-for-template-tags+ :parameters))))