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
Fixes computing columns for Question -> Question -> Model on the FE (#68140)
Alexander Polyankinfe4d26ab630d
diff --git a/src/metabase/lib/card.cljc b/src/metabase/lib/card.cljcindex 1d45b2001fb..121beff208d 100644--- a/src/metabase/lib/card.cljc+++ b/src/metabase/lib/card.cljc@@ -254,9 +254,13 @@(source-model-card metadata-providerable card))model-cols (when model-card(card-cols* metadata-providerable model-card))- native-model? (when model-card- (-> (card->underlying-query metadata-providerable model-card)- (lib.util/native-stage? -1)))]+ ;; the BE passes metadata to the FE as virtual tables that contain `:type` and `:fields` but not `:dataset-query`+ ;; in this case we should not override the `:id` and assume that the `card` metadata is up-to-date+ ;; see (metabase#68012) for more details+ native-model? (and (some? model-card)+ (some? (:dataset-query model-card))+ (-> (card->underlying-query metadata-providerable model-card)+ (lib.util/native-stage? -1)))](not-empty(into [];; do not truncate the desired column aliases coming back in card metadata, if the query returns adiff --git a/test/metabase/lib/card_test.cljc b/test/metabase/lib/card_test.cljcindex 46f78596812..a78ea9cf151 100644--- a/test/metabase/lib/card_test.cljc+++ b/test/metabase/lib/card_test.cljc@@ -624,3 +624,26 @@["Product__RATING" true]](map (juxt :lib/desired-column-alias :active)(lib/returned-columns query))))))++(deftest ^:parallel card-returned-columns-source-model-without-query-test+ (testing "should not throw when the source model does not have a query (metabase#68012)"+ (let [model-id 1+ model-query (lib/query meta/metadata-provider (meta/table-metadata :orders))+ mp (lib.tu/mock-metadata-provider+ meta/metadata-provider+ ;; intentionally omitting `:dataset-query`+ {:cards [{:id model-id+ :type :model+ :database-id (meta/id)+ :result-metadata (lib/returned-columns model-query)}]})+ question-id 2+ question-query (lib/query mp (lib.metadata/card mp model-id))+ mp (lib.tu/mock-metadata-provider+ mp+ {:cards [{:id question-id+ :type :question+ :database-id (meta/id)+ :dataset-query question-query+ :result-metadata (lib/returned-columns question-query)}]})+ adhoc-query (lib/query mp (lib.metadata/card mp question-id))]+ (is (some? (lib/returned-columns adhoc-query))))))