Skip to content

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

turn off db routing for dependencies analysis (#74091)

dpsuttonce1312302443
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.edn
index c85b02c869a..2468cc8e456 100644
--- a/.clj-kondo/config/modules/config.edn
+++ b/.clj-kondo/config/modules/config.edn
@@ -2954,6 +2954,7 @@
api
app-db
collections
+ database-routing
documents
driver
events
diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/native_validation.clj b/enterprise/backend/src/metabase_enterprise/dependencies/native_validation.clj
index 3f7b3723061..a7cda391d65 100644
--- a/enterprise/backend/src/metabase_enterprise/dependencies/native_validation.clj
+++ b/enterprise/backend/src/metabase_enterprise/dependencies/native_validation.clj
@@ -1,6 +1,7 @@
(ns metabase-enterprise.dependencies.native-validation
(:require
[clojure.string :as str]
+ [metabase.database-routing.core :as database-routing]
[metabase.driver :as driver]
[metabase.driver.sql :as driver.sql]
[metabase.lib.core :as lib]
@@ -22,9 +23,10 @@
parameter substitution must happen INSIDE the *compile-with-inline-parameters* binding
to produce inline literals instead of ? placeholders."
[query :- ::lib.schema/query]
- (let [with-params (lib/add-parameters-for-template-tags query)
- compiled (qp.compile/compile-with-inline-parameters with-params)]
- (lib/native-query with-params (:query compiled))))
+ (database-routing/with-database-routing-off
+ (let [with-params (lib/add-parameters-for-template-tags query)
+ compiled (qp.compile/compile-with-inline-parameters with-params)]
+ (lib/native-query with-params (:query compiled)))))
(defn- has-substitutable-template-tags?
"Returns true if the query has any card or table template tags that need
diff --git a/enterprise/backend/test/metabase_enterprise/dependencies/native_validation_test.clj b/enterprise/backend/test/metabase_enterprise/dependencies/native_validation_test.clj
index a39b564f3be..bed5a3dd351 100644
--- a/enterprise/backend/test/metabase_enterprise/dependencies/native_validation_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/dependencies/native_validation_test.clj
@@ -10,8 +10,12 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-metadata :as meta]
[metabase.lib.test-util :as lib.tu]
+ [metabase.test :as mt]
+ [metabase.test.fixtures :as fixtures]
[metabase.util :as u]))
+(use-fixtures :once (fixtures/initialize :db))
+
(defn- fake-query
([mp query]
(fake-query mp query {}))
@@ -609,3 +613,21 @@
:display-name "My Table"
:table-id 1}}))]
(is (empty? (deps.native-validation/validate-native-query driver query))))))
+
+(deftest ^:sequential validate-native-query-with-database-routing-test
+ (testing "native query validation works on databases with routing enabled (#74084)"
+ (mt/with-premium-features #{:database-routing}
+ (let [mp (mt/metadata-provider)
+ driver (:engine (lib.metadata/database mp))]
+ (mt/with-temp [:model/DatabaseRouter _ {:database_id (mt/id)
+ :user_attribute "db_name"}]
+ (testing "validate-native-query doesn't throw"
+ ;; Without the fix, this would throw:
+ ;; "Anonymous users cannot access a database with routing enabled."
+ (is (set? (deps.native-validation/validate-native-query
+ driver
+ (lib/native-query mp "SELECT * FROM ORDERS")))))
+ (testing "native-query-deps doesn't throw (backfill path)"
+ (is (set? (deps.native-validation/native-query-deps
+ driver
+ (lib/native-query mp "SELECT * FROM ORDERS"))))))))))