Skip to content

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

Fix impersonated model caching (#74303)

Riley Thompson1a45642180db
diff --git a/enterprise/backend/test/metabase_enterprise/impersonation/driver_test.clj b/enterprise/backend/test/metabase_enterprise/impersonation/driver_test.clj
index cc40b83abec..b6ce08c2151 100644
--- a/enterprise/backend/test/metabase_enterprise/impersonation/driver_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/impersonation/driver_test.clj
@@ -767,6 +767,30 @@
"DROP ROLE IF EXISTS \"impersonation_role\";"]]
(jdbc/execute! spec [statement]))))))))))))
+(deftest native-model-persistence-works-when-impersonation-enabled-test
+ ;; Test explicitly with postgres since it supports persistence, impersonation, and impersonated native-query
+ ;; validation.
+ (mt/test-driver :postgres
+ (mt/with-premium-features #{:advanced-permissions}
+ (mt/dataset test-data
+ (mt/with-persistence-enabled! [persist-models!]
+ (impersonation.util-test/with-impersonations! {:impersonations [{:db-id (mt/id) :attribute "impersonation_attr"}]
+ :attributes {"impersonation_attr" "impersonation_role"}}
+ (request/as-admin
+ (mt/with-temp [:model/Card model {:type :model
+ :database_id (mt/id)
+ :query_type :native
+ :dataset_query (mt/native-query {:query "SELECT 1 AS id"})
+ :result_metadata [{:name "id"
+ :base_type :type/Integer}]}]
+ (persist-models!)
+ (is (=? {:state "persisted"
+ :active true
+ :error nil}
+ (t2/select-one [:model/PersistedInfo :state :active :error]
+ :database_id (mt/id)
+ :card_id (:id model))))))))))))
+
(deftest resilient-connection-options-test
(testing "resilient connections have the correct role set"
(mt/test-drivers (mt/normal-driver-select {:+parent :sql-jdbc
diff --git a/src/metabase/driver/connection.clj b/src/metabase/driver/connection.clj
index 1b99609fdd7..f6a2fb7f8b9 100644
--- a/src/metabase/driver/connection.clj
+++ b/src/metabase/driver/connection.clj
@@ -69,7 +69,7 @@
- `:default` — primary `:details`
- `:write-data` — `:write-data-details` merged over `:details` (if configured)
- Bind via [[with-write-connection]], not directly."
+ Bind via [[with-write-connection]] or [[with-default-connection]], not directly."
:default)
(defmacro with-write-connection
@@ -81,6 +81,14 @@
`(binding [*connection-type* :write-data]
~@body))
+(defmacro with-default-connection
+ "Establishes a default-connection context for body.
+
+ Use this to compile or execute a read query from inside a broader write-connection context."
+ [& body]
+ `(binding [*connection-type* :default]
+ ~@body))
+
(def ^:dynamic ^:private *suppress-resolution-telemetry*
false)
diff --git a/src/metabase/driver/mysql/ddl.clj b/src/metabase/driver/mysql/ddl.clj
index 4b867a47460..9228ad4b545 100644
--- a/src/metabase/driver/mysql/ddl.clj
+++ b/src/metabase/driver/mysql/ddl.clj
@@ -6,6 +6,7 @@
[honey.sql :as sql]
[java-time.api :as t]
[metabase.driver-api.core :as driver-api]
+ [metabase.driver.connection :as driver.conn]
[metabase.driver.ddl.interface :as ddl.i]
[metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
[metabase.driver.sql-jdbc.execute :as sql-jdbc.execute]
@@ -67,7 +68,8 @@
(defmethod ddl.i/refresh! :mysql
[driver database definition dataset-query]
- (let [{:keys [query params]} (driver-api/compile dataset-query)
+ (let [{:keys [query params]} (driver.conn/with-default-connection
+ (driver-api/compile dataset-query))
db-spec (sql-jdbc.conn/db->pooled-connection-spec database)]
(sql-jdbc.execute/do-with-connection-with-options
driver
diff --git a/src/metabase/driver/postgres/ddl.clj b/src/metabase/driver/postgres/ddl.clj
index 8354bf21631..e4497416757 100644
--- a/src/metabase/driver/postgres/ddl.clj
+++ b/src/metabase/driver/postgres/ddl.clj
@@ -4,6 +4,7 @@
[honey.sql :as sql]
[java-time.api :as t]
[metabase.driver-api.core :as driver-api]
+ [metabase.driver.connection :as driver.conn]
[metabase.driver.ddl.interface :as ddl.i]
[metabase.driver.sql-jdbc.execute :as sql-jdbc.execute]
[metabase.driver.sql.ddl :as sql.ddl]
@@ -36,7 +37,8 @@
(defmethod ddl.i/refresh! :postgres
[driver database definition dataset-query]
- (let [{:keys [query params]} (driver-api/compile dataset-query)]
+ (let [{:keys [query params]} (driver.conn/with-default-connection
+ (driver-api/compile dataset-query))]
(sql-jdbc.execute/do-with-connection-with-options
driver
database