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
Binning middleware needs to update `:lib/original-binning` as well (#63673)
Cam Saul118613ab8991
diff --git a/e2e/test/scenarios/question/multiple-column-breakouts.cy.spec.ts b/e2e/test/scenarios/question/multiple-column-breakouts.cy.spec.tsindex 771adc8c5c3..1de46ce1b60 100644--- a/e2e/test/scenarios/question/multiple-column-breakouts.cy.spec.ts+++ b/e2e/test/scenarios/question/multiple-column-breakouts.cy.spec.ts@@ -771,7 +771,7 @@ describe("scenarios > question > multiple column breakouts", () => {describe("previous stage", () => {describe("notebook", () => {- it.skip("should be able to add post-aggregation expressions for each breakout column", () => {+ it("should be able to add post-aggregation expressions for each breakout column", () => {function testDatePostAggregationExpression({questionDetails,expression1,@@ -872,7 +872,7 @@ describe("scenarios > question > multiple column breakouts", () => {});});- it.skip("should be able to add post-aggregation filters for each breakout column", () => {+ it("should be able to add post-aggregation filters for each breakout column", () => {function addDateBetweenFilter({columnName,columnMinValue,@@ -1195,7 +1195,7 @@ describe("scenarios > question > multiple column breakouts", () => {});describe("filter picker", () => {- it.skip("should be able to add post-aggregation filters for each breakout in the filter picker", () => {+ it("should be able to add post-aggregation filters for each breakout in the filter picker", () => {function addDateBetweenFilter({columnName,columnMinValue,@@ -1451,7 +1451,7 @@ describe("scenarios > question > multiple column breakouts", () => {describe("data source", () => {describe("notebook", () => {- it.skip("should be able to add filters for each source column", () => {+ it("should be able to add filters for each source column", () => {function addDateBetweenFilter({columnName,columnMinValue,diff --git a/src/metabase/query_processor/middleware/binning.clj b/src/metabase/query_processor/middleware/binning.cljindex 11cb06798ac..a09fe00cd5d 100644--- a/src/metabase/query_processor/middleware/binning.clj+++ b/src/metabase/query_processor/middleware/binning.clj@@ -11,6 +11,7 @@[metabase.lib.util.match :as lib.util.match][metabase.lib.walk :as lib.walk][metabase.query-processor.error-type :as qp.error-type]+ [metabase.util :as u][metabase.util.i18n :refer [tru]][metabase.util.malli :as mu][metabase.util.malli.registry :as mr]))@@ -80,27 +81,28 @@resolved-options)](lib/update-options field-ref update :binning merge {:strategy new-strategy} new-options)))-(mu/defn- update-binning-strategy-in-stage- "Update `:field` clauses with `:binning` strategy options in an `inner` [MBQL] query."- [query :- ::lib.schema/query- path :- ::lib.walk/path- stage :- ::lib.schema/stage]- (let [field-id-or-name->filters (filters->field-map (:filters stage))]- (lib.util.match/replace stage- ;; don't recurse into joins (let `lib.walk` handle this for us) or into stage metadata.- (_ :guard (constantly (some (partial contains? (set &parents))- [:joins :lib/stage-metadata])))- &match-- [:field (_opts :guard :binning) _id-or-name]- (try- (update-binned-field query path field-id-or-name->filters &match)- (catch Throwable e- (throw (ex-info (ex-message e) {:clause &match} e)))))))+(defn- propagate-original-binning [query path clause]+ (let [col (lib.walk/apply-f-for-stage-at-path lib/metadata query path (lib/update-options clause dissoc :lib/original-binning))]+ (lib/update-options clause u/assoc-dissoc :lib/original-binning (:lib/original-binning col))))(mu/defn update-binning-strategy :- ::lib.schema/query"When a binned field is found, it might need to be updated if a relevant query criteria affects the min/max value ofthe binned field. This middleware looks for that criteria, then updates the related min/max values and calculatesthe bin-width based on the criteria values (or global min/max information)."[query :- ::lib.schema/query]- (lib.walk/walk-stages query update-binning-strategy-in-stage))+ (let [path->field-id-or-name->filters (memoize+ (fn [path]+ (let [stage (get-in query path)]+ (filters->field-map (:filters stage)))))]+ (lib.walk/walk-clauses+ query+ (fn [query path-type path clause]+ (when (= path-type :lib.walk/stage)+ (lib.util.match/match-lite clause+ ;; first update all the `:binning` options+ [:field (_opts :guard :binning) _id-or-name]+ (update-binned-field query path (path->field-id-or-name->filters path) clause)++ ;; then do another pass and update `:lib/original-binning` options+ [:field (_opts :guard :lib/original-binning) _id-or-name]+ (propagate-original-binning query path clause)))))))diff --git a/test/metabase/query_processor/middleware/binning_test.clj b/test/metabase/query_processor/middleware/binning_test.cljindex b1796d049a4..67e881563c0 100644--- a/test/metabase/query_processor/middleware/binning_test.clj+++ b/test/metabase/query_processor/middleware/binning_test.clj@@ -6,6 +6,7 @@[metabase.lib.convert :as lib.convert][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata]+ [metabase.lib.metadata.result-metadata :as lib.metadata.result-metadata][metabase.lib.normalize :as lib.normalize][metabase.lib.schema :as lib.schema][metabase.lib.schema.id :as lib.schema.id]@@ -246,3 +247,43 @@(update-binning-strategy mp (-> (lib/filter query (lib/between expr-col 20 40))lib.convert/->legacy-MBQL(assoc-in [:query :source-metadata] card-cols)))))))))++(deftest ^:parallel update-original-binning-e2e-test+ (testing "#63662"+ (let [query (-> (lib/query meta/metadata-provider (meta/table-metadata :orders))+ (lib/aggregate (lib/count))+ (lib/breakout (-> (meta/field-metadata :orders :total)+ (lib/with-binning {:strategy :default})))+ lib/append-stage+ qp.preprocess/preprocess)]+ (is (=? {:stages [{:aggregation [[:count {}]]+ :breakout [[:field {:binning {:bin-width 20.0, :max-value 160.0, :min-value 0.0, :num-bins 8, :strategy :num-bins}}+ any?]]+ :order-by [[:asc+ {}+ [:field {:binning {:bin-width 20.0, :max-value 160.0, :min-value 0.0, :num-bins 8, :strategy :num-bins}}+ any?]]]}+ {:fields [[:field {:lib/original-binning {:bin-width 20.0, :max-value 160.0, :min-value 0.0, :num-bins 8, :strategy :num-bins}} "TOTAL"]+ [:field {} "count"]]}]}+ query))+ (testing `lib/returned-columns+ (letfn [(returned-columns [stage-number]+ (map #(select-keys % [:lib/desired-column-alias :metabase.lib.field/binning :lib/original-binning])+ (lib/returned-columns query stage-number)))]+ (testing "first stage"+ (is (= [{:lib/desired-column-alias "TOTAL"+ :metabase.lib.field/binning {:strategy :num-bins, :min-value 0.0, :max-value 160.0, :num-bins 8, :bin-width 20.0}+ :lib/original-binning {:strategy :num-bins, :min-value 0.0, :max-value 160.0, :num-bins 8, :bin-width 20.0}}+ {:lib/desired-column-alias "count"}]+ (returned-columns 0))))+ (testing "second stage"+ (is (= [{:lib/desired-column-alias "TOTAL"+ :lib/original-binning {:strategy :num-bins, :min-value 0.0, :max-value 160.0, :num-bins 8, :bin-width 20.0}}+ {:lib/desired-column-alias "count"}]+ (returned-columns 1))))))+ (testing `lib.metadata.result-metadata/returned-columns+ (is (=? [{:lib/desired-column-alias "TOTAL"+ :binning-info {:strategy :num-bins, :min-value 0.0, :max-value 160.0, :num-bins 8, :bin-width 20.0}}+ {:lib/desired-column-alias "count"}]+ (map #(select-keys % [:lib/desired-column-alias :binning-info])+ (lib.metadata.result-metadata/returned-columns query))))))))