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
[QP] If a `:field` ref by ID needs fallback metadata, include `:join-alias` (#66563)
Braden Shepherdsone39fa096382a
diff --git a/src/metabase/lib/field/resolution.cljc b/src/metabase/lib/field/resolution.cljcindex adb8a0b5413..b7e6e98cf0f 100644--- a/src/metabase/lib/field/resolution.cljc+++ b/src/metabase/lib/field/resolution.cljc@@ -671,9 +671,9 @@(resolve-in-join query stage-number join-alias source-field id-or-name))(when source-field(resolve-in-implicit-join query stage-number source-field id-or-name))- (resolve-from-previous-stage-or-source query stage-number id-or-name)(merge- (or (fallback-metadata-for-field query stage-number id-or-name)+ (or (resolve-from-previous-stage-or-source query stage-number id-or-name)+ (fallback-metadata-for-field query stage-number id-or-name)(fallback-metadata id-or-name))(when (and join-alias(contains? (into #{}diff --git a/test/metabase/query_processor/util/add_alias_info_test.clj b/test/metabase/query_processor/util/add_alias_info_test.cljindex 6c92db1403d..ff6cab73723 100644--- a/test/metabase/query_processor/util/add_alias_info_test.clj+++ b/test/metabase/query_processor/util/add_alias_info_test.clj@@ -1315,3 +1315,43 @@first:filtersfirst))))))++(deftest ^:parallel fallback-resolve-in-later-stage-with-join-alias-test+ (testing "when generating fallback metadata from an earlier stage, include its :join-alias (#66464)"+ (let [mp (-> (lib.tu/metadata-provider-with-mock-card+ {:id 1+ :name "Orders Model"+ :type :model+ :dataset-query (lib/query meta/metadata-provider (meta/table-metadata :orders))})+ (lib.tu/metadata-provider-with-mock-card+ {:id 2+ :name "Products Model"+ :type :model+ :dataset-query (lib/query meta/metadata-provider (meta/table-metadata :products))}))+ query (-> (lib/query mp (lib.metadata/card mp 1))+ (lib/join (lib/join-clause (lib.metadata/card mp 2)))+ ;; Deliberately using field IDs rather than names here, and to tables that are not otherwise part+ ;; of this query. Some Metrics v2 queries in the wild look like this and we're trying not to break+ ;; them; see #66464.+ (lib/aggregate (lib// (lib/distinct-where (meta/field-metadata :orders :user-id)+ (-> (meta/field-metadata :people :name)+ lib/ref+ (lib/with-join-alias "Products Model - Product")+ lib/not-null))+ (lib/distinct (meta/field-metadata :orders :user-id)))))]+ (is (=? [:/ {}+ ;; numerator+ [:distinct-where {}+ vector?+ [:!= {}+ [:field {:join-alias "Products Model - Product"+ ::add/source-table "Products Model - Product"+ ::add/source-alias "NAME"+ ::add/desired-alias nil}+ (meta/id :people :name)]+ [:value {} nil]]]+ ;; denominator+ [:distinct {} vector?]]+ (-> (add-alias-info query)+ lib/aggregations+ first))))))