Skip to content

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

Extra remapped fields (#67601)

Eric Normande5ab9db7bcda
diff --git a/src/metabase/queries/models/card.clj b/src/metabase/queries/models/card.clj
index 713ecd6e35b..45262deada6 100644
--- a/src/metabase/queries/models/card.clj
+++ b/src/metabase/queries/models/card.clj
@@ -972,7 +972,10 @@
(assoc :type :question))
(m/update-existing :dataset_query lib-be/normalize-query))
{:keys [metadata metadata-future]} (card.metadata/maybe-async-result-metadata
- {:query (:dataset_query card-data)
+ ;; 1. This function is called when storing metadata.
+ ;; 2. The metadata for storage shouldn't have remaps.
+ ;; 3. Setting this keyword will keep the remapped fields out of the metadata.
+ {:query (assoc-in (:dataset_query card-data) [:middleware :disable-remaps?] true)
:metadata result_metadata
:entity-id (:entity_id card-data)
:model? (model? card-data)})
diff --git a/src/metabase/queries/models/card/metadata.clj b/src/metabase/queries/models/card/metadata.clj
index 284b684df54..bf91e3d4eb3 100644
--- a/src/metabase/queries/models/card/metadata.clj
+++ b/src/metabase/queries/models/card/metadata.clj
@@ -176,7 +176,11 @@ saved later when it is ready."
[query]
(not-empty (request/with-current-user nil
(u/ignore-exceptions
- (qp.preprocess/query->expected-cols query)))))
+ (qp.preprocess/query->expected-cols
+ ;; 1. This function is called when storing metadata.
+ ;; 2. The metadata for storage shouldn't have remaps.
+ ;; 3. Setting this keyword will keep the remapped fields out of the metadata.
+ (assoc-in query [:middleware :disable-remaps?] true))))))
(defn infer-metadata-with-model-overrides
"Does a fresh [[infer-metadata]] for the provided query.
diff --git a/test/metabase/queries/models/card/metadata_test.clj b/test/metabase/queries/models/card/metadata_test.clj
index 14040ee37a0..1611faae6b0 100644
--- a/test/metabase/queries/models/card/metadata_test.clj
+++ b/test/metabase/queries/models/card/metadata_test.clj
@@ -1,7 +1,10 @@
(ns metabase.queries.models.card.metadata-test
(:require
[clojure.test :refer :all]
- [metabase.queries.models.card.metadata :as card.metadata]))
+ [metabase.lib.core :as lib]
+ [metabase.lib.metadata :as lib.metadata]
+ [metabase.queries.models.card.metadata :as card.metadata]
+ [metabase.test :as mt]))
(deftest ^:parallel populate-result-metadata-normalize-output-test
(testing "populate-result-metadata should normalize output"
@@ -42,3 +45,18 @@
:display_name "EDITED DISPLAY"
:base_type :type/BigInteger}]}
(card.metadata/populate-result-metadata card))))))
+
+(deftest ^:parallel infer-metadata-no-remaps
+ (testing "infer-metadata should not include remapped columns (#67128)"
+ (mt/with-temp [:model/Dimension _ {:field_id (mt/id :orders :user_id)
+ :name "User ID"
+ :human_readable_field_id (mt/id :people :name)
+ :type :external}
+ :model/Dimension _ {:field_id (mt/id :orders :product_id)
+ :name "Product ID"
+ :human_readable_field_id (mt/id :products :title)
+ :type :external}]
+ (let [mp (mt/metadata-provider)
+ query (lib/query mp (lib.metadata/table mp (mt/id :orders)))]
+ (is (= 9 ;; there are two remaps, giving 11 if included
+ (count (card.metadata/infer-metadata query))))))))
diff --git a/test/metabase/queries/models/card_test.clj b/test/metabase/queries/models/card_test.clj
index 423e1240d18..eea7636f88a 100644
--- a/test/metabase/queries/models/card_test.clj
+++ b/test/metabase/queries/models/card_test.clj
@@ -2,6 +2,7 @@
(:require
[clojure.test :refer :all]
[java-time.api :as t]
+ [metabase.api.common :as api]
[metabase.audit-app.impl :as audit]
[metabase.config.core :as config]
[metabase.lib.convert :as lib.convert]
@@ -1294,3 +1295,28 @@
(t2/save! card')
(is (= :question
(t2/select-one-fn :type :model/Card :id (:id card)))))))
+
+(deftest create-card-no-remaps
+ (mt/with-current-user (mt/user->id :crowberto)
+ (mt/with-temp [:model/Dimension _ {:field_id (mt/id :orders :user_id)
+ :name "User ID"
+ :human_readable_field_id (mt/id :people :name)
+ :type :external}
+ :model/Dimension _ {:field_id (mt/id :orders :product_id)
+ :name "Product ID"
+ :human_readable_field_id (mt/id :products :title)
+ :type :external}]
+ (let [mp (mt/metadata-provider)
+ query (lib/query mp (lib.metadata/table mp (mt/id :orders)))
+ card (card/create-card! {:database_id (mt/id),
+ :display :table,
+ :visualization_settings {},
+ :type :model
+ :name "orders model"
+ :dataset_query query}
+ @api/*current-user*)]
+ (try
+ (is (= 9
+ (count (:result_metadata card))))
+ (finally
+ (t2/delete! :model/Card (:id card))))))))