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 adding two DIFFERENT implicit joins with the SAME generated alias (#67411)
Cam Saul8ce1d65f8c3f
diff --git a/src/metabase/lib/join.cljc b/src/metabase/lib/join.cljcindex 2e0f15b77c0..bc894daef8a 100644--- a/src/metabase/lib/join.cljc+++ b/src/metabase/lib/join.cljc@@ -227,7 +227,7 @@[query _stage-number {[{:keys [source-table source-card], :as _first-stage}] :stages, :as _join} _style](or(when source-table- (:display-name (lib.metadata/table query source-table)))+ ((some-fn :display-name :name) (lib.metadata/table query source-table)))(when source-card(if-let [card-metadata (lib.metadata/card query source-card)](lib.metadata.calculation/display-name query 0 card-metadata)diff --git a/src/metabase/query_processor/middleware/add_implicit_joins.clj b/src/metabase/query_processor/middleware/add_implicit_joins.cljindex ee84eed3c96..fecf34642e3 100644--- a/src/metabase/query_processor/middleware/add_implicit_joins.clj+++ b/src/metabase/query_processor/middleware/add_implicit_joins.clj@@ -115,6 +115,14 @@source-field-name):fk-join-alias source-field-join-alias)))+(defn- rename-join [{join-alias :alias, :as join} new-alias]+ (-> join+ (assoc :alias new-alias)+ (update :conditions lib.walk/walk-clauses* (fn [clause]+ (lib.util.match/match-one clause+ [:field (_opts :guard #(= (:join-alias %) join-alias)) _id-or-name]+ (lib/update-options &match assoc :join-alias new-alias))))))+(mu/defn- implicitly-joined-fields->joins :- [:sequential ::join]"Create implicit join maps for a set of `field-clauses-with-source-field`."[metadata-providerable :- ::lib.schema.metadata/metadata-providerable@@ -125,10 +133,17 @@[:field (opts :guard (every-pred :source-field (complement :join-alias))) (id :guard integer?)](field-opts->fk-field-info metadata-providerable opts))))distinct- not-empty)]- (into []- (distinct)- (fk-field-infos->joins metadata-providerable fk-field-infos))))+ not-empty)+ joins (into []+ (distinct)+ (fk-field-infos->joins metadata-providerable fk-field-infos))+ unique-name-fn (lib/non-truncating-unique-name-generator)]+ (mapv (fn [{join-alias :alias, :as join}]+ (let [deduplicated-alias (unique-name-fn join-alias)]+ (cond-> join+ (not= join-alias deduplicated-alias)+ (rename-join deduplicated-alias))))+ joins)))(mu/defn- visible-joins :- [:sequential ::lib.schema.join/join]"Set of all joins that are visible in the current level of the query or in a nested source query."diff --git a/test/metabase/query_processor/middleware/add_implicit_joins_test.clj b/test/metabase/query_processor/middleware/add_implicit_joins_test.cljindex 5140868b3b1..461b28ec330 100644--- a/test/metabase/query_processor/middleware/add_implicit_joins_test.clj+++ b/test/metabase/query_processor/middleware/add_implicit_joins_test.clj@@ -1125,3 +1125,51 @@{}{}]}preprocessed)))))++;; before the fix this failed with+;;+;; Error preprocessing query in #'metabase.query-processor.middleware.add-implicit-joins/add-implicit-joins:+;; Cannot find matching FK Table ID for FK Field 31 nil+(deftest ^:parallel conflicting-implicit-joins-with-same-generated-alias-test+ (testing "If two DIFFERENT implicit joins need to be added that would have the same generated alias, deduplicate them"+ (let [mp (-> (lib.tu/mock-metadata-provider+ {:database meta/database+ :tables [{:id 1, :name "A"}+ {:id 2, :name "B"}+ {:id 3, :name "C"}+ {:id 4, :name "D"}]+ :fields [{:id 10, :table-id 1, :name "ID", :semantic-type :type/PK}+ {:id 11, :table-id 1, :name "B_ID", :fk-target-field-id 20, :semantic-type :type/FK}+ {:id 12, :table-id 1, :name "C_ID", :fk-target-field-id 30, :semantic-type :type/FK}+ {:id 20, :table-id 2, :name "ID", :semantic-type :type/PK}+ {:id 21, :table-id 2, :name "D_ID", :fk-target-field-id 40, :semantic-type :type/FK}+ {:id 30, :table-id 3, :name "ID", :semantic-type :type/PK}+ {:id 31, :table-id 3, :name "D_ID", :fk-target-field-id 40, :semantic-type :type/FK}+ {:id 40, :table-id 4, :name "ID", :semantic-type :type/PK}+ {:id 41, :table-id 4, :name "NAME"}]})+ (lib.tu/remap-metadata-provider 21 41)+ (lib.tu/remap-metadata-provider 31 41))+ model-query (-> (lib/query mp (lib.metadata/table mp 1))+ (lib/join (lib.metadata/table mp 2))+ (lib/join (lib.metadata/table mp 3)))+ mp (lib.tu/mock-metadata-provider+ mp+ {:cards [{:id 1+ :type :model+ :name "A + B + C"+ :display-name "A + B + C"+ :dataset-query model-query}]})+ query (lib/query mp (lib.metadata/card mp 1))]+ (is (=? {:stages [{:joins [{:alias "B"}+ {:alias "C"}]}+ {:joins [{:alias "D__via__D_ID"+ :conditions [[:=+ {}+ [:field {} "B__D_ID"]+ [:field {:join-alias "D__via__D_ID"} 40]]]}+ {:alias "D__via__D_ID_2"+ :conditions [[:=+ {}+ [:field {} "C__D_ID"]+ [:field {:join-alias "D__via__D_ID_2"} 40]]]}]}]}+ (qp.preprocess/preprocess query))))))