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
[MBQL lib] Don't export a dynamic var; add `with-card-clean-hook` macro (#69662)
Braden Shepherdsonc8cd828410e6
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.ednindex 34ee9d6b6f8..47798754d77 100644--- a/.clj-kondo/config/modules/config.edn+++ b/.clj-kondo/config/modules/config.edn@@ -734,7 +734,6 @@lib{:team "Querying":api #{metabase.lib.binning- metabase.lib.convert ; Only so [[metabase.queries.models.card]] can set dynamic vars.metabase.lib.coremetabase.lib.equalitymetabase.lib.fielddiff --git a/src/metabase/lib/core.cljc b/src/metabase/lib/core.cljcindex 7b463f4dabc..2fc396d6205 100644--- a/src/metabase/lib/core.cljc+++ b/src/metabase/lib/core.cljc@@ -530,3 +530,14 @@all-template-tags-id->field-idsany-native-stage?any-native-stage-not-introduced-by-sandbox?])++#?(:clj+ (defmacro with-card-clean-hook+ "Arranges for `hook-fn` to be called during `lib.convert`'s query cleaning process, and executes the `body`+ as with [[do]].++ The `hook-fn` will be called whenever [[lib.convert/clean]] makes material changes to the query, with+ `(hook-fn pre-cleaning-query post-cleaning-query)`."+ [hook-fn & body]+ `(binding [lib.convert/*card-clean-hook* ~hook-fn]+ ~@body)))diff --git a/src/metabase/queries/models/card.clj b/src/metabase/queries/models/card.cljindex cb1c53a4eab..303cef2dc72 100644--- a/src/metabase/queries/models/card.clj+++ b/src/metabase/queries/models/card.clj@@ -17,7 +17,6 @@[metabase.dashboards.autoplace :as autoplace][metabase.events.core :as events][metabase.lib-be.core :as lib-be]- [metabase.lib.convert :as lib.convert][metabase.lib.core :as lib][metabase.lib.metadata.protocols :as lib.metadata.protocols][metabase.lib.normalize :as lib.normalize]@@ -738,8 +737,8 @@(pr-str (dissoc post-cleaning-query :lib/metadata))(:legacy_query untransformed-card)))-;; Dynamically binds [[lib.convert/*card-clean-hook*]] to a function that logs the impact of cleaning,-;; during `transform-out`, so that we can log whenever a card gets converted and [[lib.convert/clean]] makes material+;; Uses [[lib/with-card-clean-hook]] to bind a callback which logs the impact of the cleaning process during+;; `transform-out`, so that we can log whenever a card gets converted and [[lib.convert/clean]] makes material;; changes, which likely indicates a bug.(methodical/defmethod t2.pipeline/results-transform [:toucan.result-type/instances :model/Card][query-type model]@@ -751,7 +750,7 @@([acc](rf' acc))([acc card]- (binding [lib.convert/*card-clean-hook* (partial mbql5-conversion-clean-callback card)]+ (lib/with-card-clean-hook (partial mbql5-conversion-clean-callback card)(rf' acc card))))))))(t2/define-after-select :model/Card