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
Generate different column group names for joins to the same table (#70119)
metamben3a62030c09bc
diff --git a/e2e/test/scenarios/models/reproductions-1.cy.spec.ts b/e2e/test/scenarios/models/reproductions-1.cy.spec.tsindex acd65ad4891..e326bc538eb 100644--- a/e2e/test/scenarios/models/reproductions-1.cy.spec.ts+++ b/e2e/test/scenarios/models/reproductions-1.cy.spec.ts@@ -551,7 +551,7 @@ describe("issue 40635", () => {cy.findByRole("button", { name: "Add or remove columns" }).click();cy.findAllByText("ID").should("have.length", 4);cy.findAllByText("Products").should("have.length", 1);- cy.findAllByText("Products 2").should("have.length", 1);+ cy.findAllByText("Products - User").should("have.length", 1);});cy.button("Done").click();diff --git a/src/metabase/lib/column_group.cljc b/src/metabase/lib/column_group.cljcindex b227d1af899..c4ad4260991 100644--- a/src/metabase/lib/column_group.cljc+++ b/src/metabase/lib/column_group.cljc@@ -1,5 +1,5 @@(ns metabase.lib.column-group- (:refer-clojure :exclude [select-keys])+ (:refer-clojure :exclude [select-keys some])(:require[medley.core :as m][metabase.lib.card :as lib.card]@@ -14,7 +14,7 @@[metabase.lib.util :as lib.util][metabase.util.i18n :as i18n][metabase.util.malli :as mu]- [metabase.util.performance :refer [select-keys]]))+ [metabase.util.performance :refer [select-keys some]]))(def ^:private GroupType[:enum@@ -86,13 +86,30 @@:is-from-join false:is-implicitly-joinable false}))+(defn- join-display-name-duplicated?+ "Returns true if more than one join in the current stage shares the same display name as `a-join`."+ [query stage-number a-join]+ (let [joins (:joins (lib.util/query-stage query stage-number))+ this-alias (:alias a-join)+ this-name (lib.metadata.calculation/display-name query stage-number a-join)]+ (boolean+ (some (fn [other-join]+ (and (not= (:alias other-join) this-alias)+ (= (lib.metadata.calculation/display-name query stage-number other-join)+ this-name)))+ joins))))+(defmethod display-info-for-group-method :group-type/join.explicit[query stage-number {:keys [join-alias table-id card-id], :as _column-group}](merge(or(when join-alias(when-let [join (lib.join/maybe-resolve-join query stage-number join-alias)]- (lib.metadata.calculation/display-info query stage-number join)))+ (let [info (lib.metadata.calculation/display-info query stage-number join)]+ ;; When multiple joins share the same display name, use the join alias to disambiguate (#37025)+ (cond-> info+ (join-display-name-duplicated? query stage-number join)+ (assoc :display-name join-alias)))))(when table-id(when-let [table (lib.metadata/table query table-id)](lib.metadata.calculation/display-info query stage-number table)))diff --git a/test/metabase/lib/column_group_test.cljc b/test/metabase/lib/column_group_test.cljcindex f3aed5935b8..55fc6fb1f7d 100644--- a/test/metabase/lib/column_group_test.cljc+++ b/test/metabase/lib/column_group_test.cljc@@ -498,3 +498,22 @@:fk-join-alias "Reviews - Product":fk-field-id (meta/id :reviews :product-id)}](lib/group-columns cols))))))++(deftest ^:parallel multiple-joins-same-table-display-names-test+ (testing "Multiple joins to the same table should have distinguishable display names (#37025)"+ (let [query (-> (lib/query meta/metadata-provider (meta/table-metadata :orders))+ (lib/join (lib/join-clause (meta/table-metadata :products)+ [(lib/= (meta/field-metadata :orders :product-id)+ (meta/field-metadata :products :id))]))+ (lib/join (lib/join-clause (meta/table-metadata :products)+ [(lib/= (meta/field-metadata :orders :product-id)+ (meta/field-metadata :products :id))])))+ cols (lib/visible-columns query)+ groups (lib/group-columns cols)+ infos (mapv #(lib/display-info query %) groups)+ join-infos (filterv :is-from-join infos)]+ (is (= 2 (count join-infos))+ "There should be two join column groups")+ (is (not= (:display-name (first join-infos))+ (:display-name (second join-infos)))+ "Join column groups for the same table should have different display names"))))