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
fix: use any-transform-enable to gate transform hydration (#75097)
Nicola Mometto7fc7f35959fc
diff --git a/src/metabase/premium_features/core.clj b/src/metabase/premium_features/core.cljindex c76a3b9ea66..f86e25e7c82 100644--- a/src/metabase/premium_features/core.clj+++ b/src/metabase/premium_features/core.clj@@ -28,6 +28,9 @@has-any-features?has-feature?log-enabled?+ query-transforms-enabled?+ python-transforms-enabled?+ any-transforms-enabled?max-users-allowedmetersplan-aliasdiff --git a/src/metabase/premium_features/token_check.clj b/src/metabase/premium_features/token_check.cljindex 60e2d892db8..33a1d48d73a 100644--- a/src/metabase/premium_features/token_check.clj+++ b/src/metabase/premium_features/token_check.clj@@ -712,6 +712,26 @@[](or (premium-features.settings/is-hosted?) (has-feature? :audit-app)))+(defn query-transforms-enabled?+ "Whether query (native/MBQL) transforms are available on this instance. Available on any non-hosted+ instance (OSS intentionally gets query transforms without a license), or on hosted instances with the+ `:transforms-basic` feature."+ []+ (or (not (premium-features.settings/is-hosted?))+ (has-feature? :transforms-basic)))++(defn python-transforms-enabled?+ "Whether Python transforms are available on this instance. EE only; requires both `:transforms-basic`+ and `:transforms-python`."+ []+ (and (has-feature? :transforms-basic)+ (has-feature? :transforms-python)))++(defn any-transforms-enabled?+ "Whether any kind of transform is available on this instance."+ []+ (or (query-transforms-enabled?) (python-transforms-enabled?)))+(defenterprise decode-airgap-token"In OSS, this returns an empty map."metabase-enterprise.premium-features.airgapdiff --git a/src/metabase/sync/util.clj b/src/metabase/sync/util.cljindex 730010c3b53..1000dc9910f 100644--- a/src/metabase/sync/util.clj+++ b/src/metabase/sync/util.clj@@ -35,17 +35,11 @@"Prefix used for temporary tables created during transforms.""mb_transform_temp_table")-(defn- transforms-enabled?- "Whether any transforms are enabled."- []- (or (not (premium-features/is-hosted?))- (premium-features/has-feature? :transforms-basic)))-(defn is-temp-transform-table?"Return true when `table` matches the transform temporary table naming pattern and transforms are enabled."[table](boolean- (when (and (transforms-enabled?) (:name table))+ (when (and (premium-features/any-transforms-enabled?) (:name table))(str/starts-with? (u/lower-case-en (:name table)) transform-temp-table-prefix))))(derive ::event :metabase/event)diff --git a/src/metabase/transforms/feature_gating.clj b/src/metabase/transforms/feature_gating.cljindex a3457ebe0c8..b2d3fce5f3d 100644--- a/src/metabase/transforms/feature_gating.clj+++ b/src/metabase/transforms/feature_gating.clj@@ -2,27 +2,9 @@(:require[metabase.premium-features.core :as premium-features]))-(defn query-transforms-enabled?- "Query transforms: available in OSS, requires :transforms-basic feature in EE.- Note: OSS intentionally gets query transforms without a license."- []- (or (not (premium-features/is-hosted?))- (premium-features/has-feature? :transforms-basic)))--(defn python-transforms-enabled?- "Python transforms: EE only, requires both :transforms-basic and :transforms-python."- []- (and (premium-features/has-feature? :transforms-basic)- (premium-features/has-feature? :transforms-python)))-(defn enabled-source-types"Returns set of enabled source types for WHERE clause filtering."[](cond-> #{}- (query-transforms-enabled?) (into ["native" "mbql"])- (python-transforms-enabled?) (conj "python")))--(defn any-transforms-enabled?- "Whether any transforms are enabled."- []- (or (query-transforms-enabled?) (python-transforms-enabled?)))+ (premium-features/query-transforms-enabled?) (into ["native" "mbql"])+ (premium-features/python-transforms-enabled?) (conj "python")))diff --git a/src/metabase/transforms/util.clj b/src/metabase/transforms/util.cljindex ad5d437c3b7..2ccff79e3ed 100644--- a/src/metabase/transforms/util.clj+++ b/src/metabase/transforms/util.clj@@ -14,6 +14,7 @@[metabase.driver.sql-jdbc :as sql-jdbc][metabase.driver.util :as driver.u][metabase.models.interface :as mi]+ [metabase.premium-features.core :as premium-features][metabase.query-processor.pipeline :as qp.pipeline][metabase.tracing.core :as tracing][metabase.transforms-base.util :as transforms-base.u]@@ -34,8 +35,8 @@"Checking whether we have proper feature flags for using a given transform."[transform](cond- (transforms-base.u/query-transform? transform) (transforms.gating/query-transforms-enabled?)- (transforms-base.u/python-transform? transform) (transforms.gating/python-transforms-enabled?)+ (transforms-base.u/query-transform? transform) (premium-features/query-transforms-enabled?)+ (transforms-base.u/python-transform? transform) (premium-features/python-transforms-enabled?):else false))(defn enabled-source-types-for-user@@ -156,5 +157,5 @@"Return true when `table` matches the transform temporary table naming pattern and transforms are enabled."[table](boolean- (when-let [table-name (and (transforms.gating/any-transforms-enabled?) (:name table))]+ (when-let [table-name (and (premium-features/any-transforms-enabled?) (:name table))](str/starts-with? (u/lower-case-en table-name) driver.u/transform-temp-table-prefix))))diff --git a/src/metabase/warehouse_schema/table.clj b/src/metabase/warehouse_schema/table.cljindex 3454b5cc142..5dd76c3a58b 100644--- a/src/metabase/warehouse_schema/table.clj+++ b/src/metabase/warehouse_schema/table.clj@@ -48,7 +48,7 @@(api/check-403 (can-access-table-for-query-metadata? table)))(let [hydration-keys (cond-> [:db [:fields [:target :has_field_values] :has_field_values :dimensions :name_field][:segments :definition_description] [:measures :definition_description] :metrics :collection]- (premium-features/has-feature? :transforms-basic) (conj :transform))]+ (premium-features/any-transforms-enabled?) (conj :transform))](-> table(update :collection nil-if-unreadable)(#(apply t2/hydrate % hydration-keys))diff --git a/src/metabase/warehouse_schema_rest/api/table.clj b/src/metabase/warehouse_schema_rest/api/table.cljindex 8bca54b52e1..e23b206201f 100644--- a/src/metabase/warehouse_schema_rest/api/table.clj+++ b/src/metabase/warehouse_schema_rest/api/table.clj@@ -118,7 +118,7 @@[:= :d.to_entity_type "table"]]}]))query {:where where, :order-by [[:name :asc]]}hydrations (cond-> [:db]- (premium-features/has-feature? :transforms-basic) (conj :transform))]+ (premium-features/any-transforms-enabled?) (conj :transform))](as-> (t2/select :model/Table query) tables(apply t2/hydrate tables hydrations)(into [] (comp (filter mi/can-read?)diff --git a/src/metabase/warehouses_rest/api.clj b/src/metabase/warehouses_rest/api.cljindex 014fb249357..86f22c23bb4 100644--- a/src/metabase/warehouses_rest/api.clj+++ b/src/metabase/warehouses_rest/api.clj@@ -1524,7 +1524,7 @@can-query? (filter mi/can-query?)can-write-metadata? (filter mi/can-write?))hydration-keys (cond-> []- (premium-features/has-feature? :transforms-basic) (conj :transform)+ (premium-features/any-transforms-enabled?) (conj :transform)include-measures? (conj :measures))](if (seq hydration-keys)(apply t2/hydrate filtered-tables hydration-keys)diff --git a/test/metabase/warehouse_schema_rest/api/table_test.clj b/test/metabase/warehouse_schema_rest/api/table_test.cljindex b884d515bb2..9b5145d942d 100644--- a/test/metabase/warehouse_schema_rest/api/table_test.clj+++ b/test/metabase/warehouse_schema_rest/api/table_test.clj@@ -11,6 +11,7 @@[metabase.driver.sql-jdbc.connection :as sql-jdbc.conn][metabase.driver.util :as driver.u][metabase.events.core :as events]+ [metabase.lib.core :as lib][metabase.permissions.models.data-permissions :as data-perms][metabase.permissions.models.permissions :as perms][metabase.permissions.models.permissions-group :as perms-group]@@ -240,7 +241,7 @@(mt/user-http-request :rasta :get 404 (format "table/%d/data" 133713371337)))))))(defn- query-metadata-defaults []- (table-defaults))+ (assoc (table-defaults) :transform nil))(deftest ^:parallel sensitive-fields-included-test(mt/with-premium-features #{}@@ -390,6 +391,22 @@(mt/user-http-request :rasta :get 200 (format "table/%d/query_metadata" (mt/id :users))))"Make sure that getting the User table does *not* include password info")))))+(deftest query-metadata-transform-hydration-test+ (testing "GET /api/table/:id/query_metadata hydrates the source :transform based on transforms availability (GDGT-2523)"+ (mt/with-temp [:model/Transform transform {:name "My transform"+ :source {:type "query"+ :query (lib/native-query (mt/metadata-provider) "SELECT 1")}+ :target {:database (mt/id) :table "my_transform_table"}}+ :model/Table {table-id :id} {:db_id (mt/id)+ :transform_id (:id transform)}]+ (testing "self-hosted (not hosted) without :transforms-basic still hydrates the source transform"+ (mt/with-premium-features #{}+ (is (=? {:transform {:id (:id transform)}}+ (mt/user-http-request :crowberto :get 200 (format "table/%d/query_metadata" table-id))))))+ (testing "hosted instance without :transforms-basic does not hydrate the source transform"+ (mt/with-premium-features #{:hosting}+ (is (nil? (:transform (mt/user-http-request :crowberto :get 200 (format "table/%d/query_metadata" table-id))))))))))+(deftest fk-target-permissions-test(testing "GET /api/table/:id/query_metadata"(testing (str "Check that FK fields belonging to Tables we don't have permissions for don't come back as hydrated "