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
Ensure we normalize queries before detecting transform source type (#65541)
Noah Moss450dddb45637
diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/context.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/context.cljindex 9c820c1c45a..e81327d69e5 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/context.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot_v3/context.clj@@ -140,7 +140,9 @@(try(if (and (= (:type item) "transform")(not (:source_type item)))- (assoc item :source_type (transforms.util/transform-source-type (:source item)))+ (let [transform (transforms.util/normalize-transform item)]+ (assoc transform+ :source_type (transforms.util/transform-source-type (:source transform))))item)(catch Exception e(log/error e "Error annotating transform source type for metabot context")diff --git a/enterprise/backend/src/metabase_enterprise/transforms/util.clj b/enterprise/backend/src/metabase_enterprise/transforms/util.cljindex cca75ce89e4..7fac5543d90 100644--- a/enterprise/backend/src/metabase_enterprise/transforms/util.clj+++ b/enterprise/backend/src/metabase_enterprise/transforms/util.clj@@ -8,6 +8,7 @@[metabase-enterprise.transforms.models.transform-run :as transform-run][metabase-enterprise.transforms.settings :as transforms.settings][metabase.driver :as driver]+ [metabase.lib-be.core :as lib-be][metabase.lib.core :as lib][metabase.lib.schema.common :as lib.schema.common][metabase.premium-features.core :as premium-features :refer [defenterprise]]@@ -44,7 +45,8 @@(= :query (-> transform :source :type keyword)))(defn native-query-transform?- "Check if this is a native query transform"+ "Check if this is a native query transform.+ Note: The transform should be normalized (via `normalize-transform`) before calling this function."[transform](when (query-transform? transform)(let [query (-> transform :source :query)]@@ -55,9 +57,20 @@[transform](= :python (-> transform :source :type keyword)))+(defn normalize-transform+ "Normalize a transform's source query, similar to how transforms are normalized when read from the database.+ This should be called on transforms before processing them to ensure queries are in the expected format."+ [transform]+ (if (and (map? transform)+ (= (:type transform) "transform")+ (get-in transform [:source :query]))+ (update-in transform [:source :query] lib-be/normalize-query)+ transform))+(defn transform-source-type"Returns the type of a transform's source: :python, :native, or :mbql.- Throws if the source type cannot be detected."+ Throws if the source type cannot be detected.+ Note: The transform should be normalized (via `normalize-transform`) before calling this function."[source](case (keyword (:type source)):python :pythondiff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/context_test.clj b/enterprise/backend/test/metabase_enterprise/metabot_v3/context_test.cljindex ffba7c58d4e..b37a9998a93 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/context_test.clj+++ b/enterprise/backend/test/metabase_enterprise/metabot_v3/context_test.clj@@ -208,3 +208,14 @@:source-database (mt/id)}}]}result (#'context/annotate-transform-source-types input)](is (= :python (get-in result [:user_is_viewing 0 :source_type]))))))++(deftest annotate-transform-source-types-normalization-test+ (testing "Transform source query gets normalized before query type detection"+ (let [input {:user_is_viewing [{:type "transform"+ :source {:type "query"+ :query {:lib/type "mbql/query"+ :stages [{:native "SELECT * FROM users"+ :lib/type "mbql.stage/native"}]+ :database (mt/id)}}}]}+ result (#'context/annotate-transform-source-types input)]+ (is (= :native (get-in result [:user_is_viewing 0 :source_type]))))))