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
Display "previous results" when a join's conditions specify multiple lhs tables (#65239)
William14d2f55fa2ab
diff --git a/src/metabase/lib/join.cljc b/src/metabase/lib/join.cljcindex 53e258e6586..777b24accb3 100644--- a/src/metabase/lib/join.cljc+++ b/src/metabase/lib/join.cljc@@ -1079,13 +1079,19 @@(defn- join-lhs-display-name-from-condition-lhs[query stage-number join-or-joinable condition-lhs-or-nil]- (when-let [lhs-column-ref (or condition-lhs-or-nil- (when (join? join-or-joinable)- (when-let [lhs (standard-join-condition-lhs (first (join-conditions join-or-joinable)))]- (when (lib.util/field-clause? lhs)- lhs))))]- (let [display-info (lib.metadata.calculation/display-info query stage-number lhs-column-ref)]- (get-in display-info [:table :display-name]))))+ (when-let [lhs-column-refs (cond+ condition-lhs-or-nil [condition-lhs-or-nil]+ (join? join-or-joinable) (->> (join-conditions join-or-joinable)+ (keep #(let [lhs (standard-join-condition-lhs %)]+ (when (and lhs (lib.util/field-clause? lhs))+ lhs)))+ seq))]+ (let [table-names (into #{}+ (map #(-> (lib.metadata.calculation/display-info query stage-number %)+ (get-in [:table :display-name])))+ lhs-column-refs)]+ (when (= (count table-names) 1)+ (first table-names)))))(defn- first-join?"Whether a `join-or-joinable` is (or will be) the first join in a stage of a query.diff --git a/test/metabase/lib/join_test.cljc b/test/metabase/lib/join_test.cljcindex 2034f9e6ea9..5bca9c01bca 100644--- a/test/metabase/lib/join_test.cljc+++ b/test/metabase/lib/join_test.cljc@@ -1300,12 +1300,24 @@(meta/id :categories :name)]]}(lib/with-join-fields join cols)))))))))+(defn- add-double-condition-join [query previous-alias current-alias]+ (lib/join query (-> (lib/join-clause (meta/table-metadata :categories))+ (lib/with-join-alias current-alias)+ (lib/with-join-conditions+ [(lib/= (meta/field-metadata :venues :category-id)+ (lib/with-join-alias (meta/field-metadata :categories :id) current-alias))+ (lib/= (lib/with-join-alias (meta/field-metadata :categories :id) previous-alias)+ (lib/with-join-alias (meta/field-metadata :categories :id) current-alias))])+ (lib/with-join-fields :all))))+(deftest ^:parallel join-lhs-display-name-test(doseq [[source-table? query] {true (lib.tu/venues-query)false (lib.tu/query-with-source-card)}[num-existing-joins query] {0 query1 (lib.tu/add-joins query "J1")- 2 (lib.tu/add-joins query "J1" "J2")}+ 2 (lib.tu/add-joins query "J1" "J2")+ 3 (-> (lib.tu/add-joins query "J1" "J2")+ (add-double-condition-join "J2" "J3"))}[first-join? join? join-or-joinable] (list*[(zero? num-existing-joins) false (meta/table-metadata :venues)][(zero? num-existing-joins) false (:venues (lib.tu/mock-cards))]@@ -1314,6 +1326,9 @@(cons [true true first-join](for [join more][false true join]))))+ :let [join-condition-count (if (= (lib/dispatch-value join-or-joinable) :mbql/join)+ (count (lib/join-conditions join-or-joinable))+ 1)][num-stages query] {1 query2 (lib/append-stage query)}](testing (str "query w/ source table?" source-table? \newline@@ -1327,7 +1342,9 @@(lib/join-lhs-display-name query join-or-joinable (meta/field-metadata :orders :product-id)))))(testing "existing join should use the display name for condition LHS"(when join?- (is (= "Venues"+ (is (= (if (= join-condition-count 1)+ "Venues"+ "Previous results")(lib/join-lhs-display-name query join-or-joinable)))))(testing "The first join should use the display name of the query `:source-table` without explicit LHS"(when (and source-table?