Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Normalize transforms metadata (#68490)

metamben1712274b85d7
diff --git a/src/metabase/lib/metadata.cljc b/src/metabase/lib/metadata.cljc
index 20ab3ab6121..c5a37177827 100644
--- a/src/metabase/lib/metadata.cljc
+++ b/src/metabase/lib/metadata.cljc
@@ -1,5 +1,5 @@
(ns metabase.lib.metadata
- (:refer-clojure :exclude [every? empty? #?(:clj doseq) get-in #?(:clj for)])
+ (:refer-clojure :exclude [every? empty? not-empty #?(:clj doseq) get-in #?(:clj for)])
(:require
[medley.core :as m]
[metabase.lib.metadata.cache :as lib.metadata.cache]
@@ -14,7 +14,7 @@
[metabase.util.i18n :as i18n]
[metabase.util.malli :as mu]
[metabase.util.namespaces :as shared.ns]
- [metabase.util.performance :refer [every? empty? #?(:clj doseq) get-in #?(:clj for)]]))
+ [metabase.util.performance :refer [every? empty? not-empty #?(:clj doseq) get-in #?(:clj for)]]))
;;; TODO -- deprecate all the schemas below, and just use the versions in [[lib.schema.metadata]] instead.
@@ -129,7 +129,9 @@
(mu/defn transforms :- [:maybe [:sequential ::lib.schema.metadata/transform]]
"Gets all Transforms"
[metadata-providerable :- ::lib.schema.metadata/metadata-providerable]
- (lib.metadata.protocols/transforms (->metadata-provider metadata-providerable)))
+ (->> (lib.metadata.protocols/transforms (->metadata-provider metadata-providerable))
+ (map #(m/update-existing-in % [:source :query] normalize-query metadata-providerable))
+ not-empty))
(mu/defn setting :- any?
"Get the value of a Metabase setting for the instance we're querying."
diff --git a/test/metabase/lib/metadata_test.cljc b/test/metabase/lib/metadata_test.cljc
index eaed76c785b..013d0587637 100644
--- a/test/metabase/lib/metadata_test.cljc
+++ b/test/metabase/lib/metadata_test.cljc
@@ -5,7 +5,8 @@
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-metadata :as meta]
- [metabase.lib.test-util :as lib.tu]))
+ [metabase.lib.test-util :as lib.tu]
+ [metabase.lib.test-util.metadata-providers.mock :as lib.tu.mock]))
(comment lib/keep-me)
#?(:cljs (comment metabase.test-runner.assert-exprs.approximately-equal/keep-me))
@@ -68,3 +69,27 @@
query-without-feature (assoc query :lib/metadata provider-without-feature)]
(is (lib.metadata/database-supports? query-with-feature ::special-feature))
(is (not (lib.metadata/database-supports? query-without-feature ::special-feature)))))
+
+(deftest ^:parallel transforms-normalizes-query-test
+ (testing "transforms (plural) should normalize queries like transform (singular) does"
+ (let [;; Create a legacy MBQL query (not pMBQL)
+ legacy-query {:database (meta/id)
+ :type :query
+ :query {:source-table (meta/id :orders)}}
+ transform {:id 1
+ :name "Test Transform"
+ :source {:query legacy-query}
+ :target {:schema "public"
+ :name "output"}}
+ mp (lib.tu.mock/mock-metadata-provider
+ meta/metadata-provider
+ {:transforms [transform]})
+ ;; Get the single transform - this normalizes the query
+ single-transform (lib.metadata/transform mp 1)]
+ (testing "transform (singular) normalizes the query to pMBQL"
+ (is (= :mbql/query (get-in single-transform [:source :query :lib/type]))
+ "transform should return a normalized pMBQL query with :lib/type"))
+ (testing "transforms (plural) should return the same normalized metadata"
+ (let [all-transforms (lib.metadata/transforms mp)
+ first-transform (first all-transforms)]
+ (is (= single-transform first-transform)))))))