Skip to content

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

qp catches circular queries involving both sql and mbql cards (#65875)

William7a5d365a4d49
diff --git a/src/metabase/query_processor/middleware/resolve_referenced.clj b/src/metabase/query_processor/middleware/resolve_referenced.clj
index 7ef3eae601a..2a7b7e8ab69 100644
--- a/src/metabase/query_processor/middleware/resolve_referenced.clj
+++ b/src/metabase/query_processor/middleware/resolve_referenced.clj
@@ -49,7 +49,8 @@
init-query :- ::lib.schema/query]
(letfn [(card-subquery-graph [mp graph card-id]
(let [card-query (fetch-card-query mp card-id)
- card-ids (lib/native-query-card-ids card-query)
+ card-ids (concat (lib/native-query-card-ids card-query)
+ (lib/all-source-card-ids card-query))
snippet-ids (lib/native-query-snippet-ids card-query)]
(subquery-graph* mp graph ::card card-id card-ids snippet-ids)))
(snippet-subquery-graph [mp graph snippet-id]
diff --git a/test/metabase/query_processor/middleware/resolve_referenced_test.clj b/test/metabase/query_processor/middleware/resolve_referenced_test.clj
index 5e16ecd1077..8cf7c339cde 100644
--- a/test/metabase/query_processor/middleware/resolve_referenced_test.clj
+++ b/test/metabase/query_processor/middleware/resolve_referenced_test.clj
@@ -89,6 +89,35 @@
::qp.resolve-referenced/card 1)
(ex-message e)))))))))
+(deftest ^:parallel circular-referencing-tags-and-mbql-queries-test
+ (testing "fails on query with circular referencing sub-queries involving both mbql and native queries #65743"
+ (let [metadata-provider (lib.tu/metadata-provider-with-cards-for-queries
+ meta/metadata-provider
+ [{:database (meta/id)
+ :type :native
+ :native {:query "SELECT * FROM {{#2}} AS c2"
+ :template-tags (card-template-tags [2])}}
+ {:database (meta/id)
+ :type :query
+ :query {:source-table "card__1"}}])
+ entrypoint-query (lib/query
+ metadata-provider
+ {:database (meta/id)
+ :type :native
+ :native {:query "SELECT * FROM {{#1}}"
+ :template-tags (card-template-tags [1])}})]
+ (is (thrown?
+ ExceptionInfo
+ (#'qp.resolve-referenced/check-for-circular-references entrypoint-query)))
+ (try
+ (#'qp.resolve-referenced/check-for-circular-references entrypoint-query)
+ (catch ExceptionInfo e
+ (testing e
+ (is (= (#'qp.resolve-referenced/circular-ref-error entrypoint-query
+ ::qp.resolve-referenced/card 2
+ ::qp.resolve-referenced/card 1)
+ (ex-message e)))))))))
+
(defn- make-card-template-tag
"Helper to create a card template tag with proper display-name"
[card-id & [tag-name]]