Skip to content

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

Do not recurse forever when resolving bad :field refs for expressions (#63926)

Cam Saul4b99060f46ec
diff --git a/src/metabase/lib/field/resolution.cljc b/src/metabase/lib/field/resolution.cljc
index 69dc15f28bd..1ca8609aadd 100644
--- a/src/metabase/lib/field/resolution.cljc
+++ b/src/metabase/lib/field/resolution.cljc
@@ -590,16 +590,20 @@
:source/table-defaults
:source/previous-stage)))))
+(def ^:private ^:dynamic *recursive-expression-resolution?* false)
+
(defn- maybe-resolve-expression-in-current-stage [query stage-number id-or-name]
- (when (string? id-or-name)
- (when-some [expr (lib.expression/maybe-resolve-expression query stage-number id-or-name)]
- (log/warn (u/format-color :red
- (str "Resolved field %s to an expression. Please remember to use :expression references"
- " for expressions in the current stage -- using a :field ref is unsupported and may"
- " not be allowed in the future.")
- (pr-str id-or-name)))
- (-> (lib.expression/expression-metadata query stage-number expr)
- (assoc :lib/source-column-alias id-or-name)))))
+ (when (and (string? id-or-name)
+ (not *recursive-expression-resolution?*))
+ (binding [*recursive-expression-resolution?* true]
+ (when-some [expr (lib.expression/maybe-resolve-expression query stage-number id-or-name)]
+ (log/warn (u/format-color :red
+ (str "Resolved field %s to an expression. Please remember to use :expression references"
+ " for expressions in the current stage -- using a :field ref is unsupported and may"
+ " not be allowed in the future.")
+ (pr-str id-or-name)))
+ (-> (lib.expression/expression-metadata query stage-number expr)
+ (assoc :lib/source-column-alias id-or-name))))))
(mu/defn- resolve-from-previous-stage-or-source :- ::lib.metadata.calculation/visible-column
[query :- ::lib.schema/query
diff --git a/test/metabase/lib/field/resolution_test.cljc b/test/metabase/lib/field/resolution_test.cljc
index 7a097313216..a0a480f3777 100644
--- a/test/metabase/lib/field/resolution_test.cljc
+++ b/test/metabase/lib/field/resolution_test.cljc
@@ -1308,6 +1308,29 @@
query -1
[:field {:base-type :type/Integer, :lib/uuid "00000000-0000-0000-0000-000000000000"} "my_numberLiteral"]))))))
+(deftest ^:parallel resolve-incorrect-field-ref-for-expression-test-2
+ (testing "Do not recurse forever if expressions mutually reference one another somehow (#63743)"
+ (let [query (lib/query
+ meta/metadata-provider
+ {:lib/type :mbql/query
+ :stages [{:lib/type :mbql.stage/mbql
+ :source-table (meta/id :venues)
+ :fields [[:expression {} "expr_1"]
+ [:expression {} "expr_2"]]
+ :expressions [[:field {:base-type :type/Integer, :lib/expression_name "expr_1"} "expr_2"]
+ [:field {:base-type :type/Integer, :lib/expression_name "expr_2"} "expr_1"]]}]})]
+ (is (=? {:base-type :type/Integer
+ :display-name "expr_2"
+ :name "expr_2"
+ :lib/expression-name "expr_2"
+ :lib/source :source/expressions
+ :lib/source-column-alias "expr_2"
+ :lib/source-uuid "00000000-0000-0000-0000-000000000000"
+ :lib/type :metadata/column}
+ (lib.field.resolution/resolve-field-ref
+ query -1
+ [:field {:base-type :type/Integer, :lib/uuid "00000000-0000-0000-0000-000000000000"} "expr_2"]))))))
+
(deftest ^:parallel field-name-ref-in-first-stage-test
(testing "Should be able to resolve a field name ref in the first stage of a query"
(let [query (lib/query