Skip to content

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

Don't destroy database during creation failure for cloud DBs. (#76363)

technomancy6fe0c5b57ef9
diff --git a/modules/drivers/bigquery-cloud-sdk/test/metabase/test/data/bigquery_cloud_sdk.clj b/modules/drivers/bigquery-cloud-sdk/test/metabase/test/data/bigquery_cloud_sdk.clj
index 26cd73deee3..f87f4b1b265 100644
--- a/modules/drivers/bigquery-cloud-sdk/test/metabase/test/data/bigquery_cloud_sdk.clj
+++ b/modules/drivers/bigquery-cloud-sdk/test/metabase/test/data/bigquery_cloud_sdk.clj
@@ -94,6 +94,9 @@
:dataset-filters-patterns (test-dataset-id db-def)
:include-user-id-and-hash true))
+(defmethod driver/database-supports? [:bigquery-cloud-sdk :test/dynamic-dataset-loading]
+ [_driver _feature _database] false)
+
;;; -------------------------------------------------- Loading Data --------------------------------------------------
(mu/defmethod sql.tx/qualified-name-components :bigquery-cloud-sdk
diff --git a/test/metabase/test/data/impl/get_or_create.clj b/test/metabase/test/data/impl/get_or_create.clj
index 00e594ef701..ad7dfcb242d 100644
--- a/test/metabase/test/data/impl/get_or_create.clj
+++ b/test/metabase/test/data/impl/get_or_create.clj
@@ -445,8 +445,12 @@
(load-dataset-data-if-needed! driver database-definition)
(create-and-sync-Database! driver database-definition)
(catch Throwable e
- (log/errorf e "create-database! failed; destroying %s database %s" driver (pr-str database-name))
- (tx/destroy-db! driver database-definition)
+ ;; Destroying the DB when there's a failure loading and syncing is fine
+ ;; for most DBs, but for cloud databases it makes things worse.
+ (when (driver/database-supports? driver :test/dynamic-dataset-loading nil)
+ #_{:clj-kondo/ignore [:discouraged-var]}
+ (log/errorf e "create-database! failed; destroying %s database %s" driver (pr-str database-name))
+ (tx/destroy-db! driver database-definition))
(throw e))))
(defn- create-database-with-bound-settings! [driver dbdef]