diff --git a/test/metabase/test/data/crate.clj b/test/metabase/test/data/crate.clj
index ea76adf1c1c23c77abe673eeee1ed457af00c372..65115ab6ba93aee9eb4e7acb8833a844c1b8d051 100644
--- a/test/metabase/test/data/crate.clj
+++ b/test/metabase/test/data/crate.clj
@@ -54,7 +54,7 @@
(constantly {:hosts "localhost:5200"}))
(extend CrateDriver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(merge generic/DefaultsMixin
{:execute-sql! generic/sequentially-execute-sql!
:field-base-type->sql-type (u/drop-first-arg field-base-type->sql-type)
diff --git a/test/metabase/test/data/generic_sql.clj b/test/metabase/test/data/generic_sql.clj
index 87d2eaf65ede4ccdd059afbb7120cdd02be1c00b..43f17f1210b07640d1f415a973e1e82e9afe48ae 100644
--- a/test/metabase/test/data/generic_sql.clj
+++ b/test/metabase/test/data/generic_sql.clj
@@ -17,9 +17,9 @@
;;; ## ------------------------------------------------------------ IGenericDatasetLoader + default impls ------------------------------------------------------------
-(defprotocol IGenericSQLDatasetLoader
+(defprotocol IGenericSQLTestExtensions
"Methods for loading `DatabaseDefinition` in a SQL database.
- A type that implements `IGenericSQLDatasetLoader` can be made to implement most of `IDriverTestExtensions`
+ A type that implements `IGenericSQLTestExtensions` can be made to implement most of `IDriverTestExtensions`
by using the `IDriverTestExtensionsMixin`.
Methods marked *Optional* below have a default implementation specified in `DefaultsMixin`."
@@ -259,7 +259,7 @@
(def DefaultsMixin
- "Default implementations for methods marked *Optional* in `IGenericSQLDatasetLoader`."
+ "Default implementations for methods marked *Optional* in `IGenericSQLTestExtensions`."
{:add-fk-sql default-add-fk-sql
:create-db-sql default-create-db-sql
:create-table-sql default-create-table-sql
@@ -316,7 +316,7 @@
(load-data! driver dbdef tabledef)))
(def IDriverTestExtensionsMixin
- "Mixin for `IGenericSQLDatasetLoader` types to implement `create-db!` from `IDriverTestExtensions`."
+ "Mixin for `IGenericSQLTestExtensions` types to implement `create-db!` from `IDriverTestExtensions`."
(merge i/IDriverTestExtensionsDefaultsMixin
{:create-db! create-db!}))
diff --git a/test/metabase/test/data/h2.clj b/test/metabase/test/data/h2.clj
index 1edd93d0c7ac71369bb9a792474920569a956021..7fb3104d843174c5ce422916f7af3ae2636dacdc 100644
--- a/test/metabase/test/data/h2.clj
+++ b/test/metabase/test/data/h2.clj
@@ -51,7 +51,7 @@
(u/strict-extend H2Driver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(let [{:keys [execute-sql!], :as mixin} generic/DefaultsMixin]
(merge mixin
{:create-db-sql (constantly create-db-sql)
diff --git a/test/metabase/test/data/mysql.clj b/test/metabase/test/data/mysql.clj
index aad354c6a36d0cb1fd88be9b9ceea743cdf438c7..6db38b8cbc5572dad17276d98d6ba232f573495a 100644
--- a/test/metabase/test/data/mysql.clj
+++ b/test/metabase/test/data/mysql.clj
@@ -35,7 +35,7 @@
(str \` nm \`))
(u/strict-extend MySQLDriver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(merge generic/DefaultsMixin
{:database->spec (comp add-connection-params (:database->spec generic/DefaultsMixin))
:execute-sql! generic/sequentially-execute-sql! ; TODO - we might be able to do SQL all at once by setting `allowMultiQueries=true` on the connection string
diff --git a/test/metabase/test/data/oracle.clj b/test/metabase/test/data/oracle.clj
index 0f76d97f3c635894b377ac2d3f8eefa7b865546d..33d7c0ccbf502c4bdf86c398fea57be7e80a6d86 100644
--- a/test/metabase/test/data/oracle.clj
+++ b/test/metabase/test/data/oracle.clj
@@ -72,7 +72,7 @@
(extend OracleDriver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(merge generic/DefaultsMixin
{:create-db-sql (constantly nil)
:drop-db-if-exists-sql (constantly nil)
diff --git a/test/metabase/test/data/postgres.clj b/test/metabase/test/data/postgres.clj
index b36892f860c84c867000a9fd58ed4e2a23f0fa0e..9c152d0a866e1ca095a20833c31de2d0fa2c3a2a 100644
--- a/test/metabase/test/data/postgres.clj
+++ b/test/metabase/test/data/postgres.clj
@@ -46,7 +46,7 @@
(u/strict-extend PostgresDriver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(merge generic/DefaultsMixin
{:drop-db-if-exists-sql drop-db-if-exists-sql
:drop-table-if-exists-sql generic/drop-table-if-exists-cascade-sql
diff --git a/test/metabase/test/data/redshift.clj b/test/metabase/test/data/redshift.clj
index 181697a02b67c3eb21465fb637544e66a3b41187..8368d3167be68a661914732a20e22f59a57c975a 100644
--- a/test/metabase/test/data/redshift.clj
+++ b/test/metabase/test/data/redshift.clj
@@ -48,7 +48,7 @@
(u/strict-extend RedshiftDriver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(merge generic/DefaultsMixin
{:create-db-sql (constantly nil)
:drop-db-if-exists-sql (constantly nil)
diff --git a/test/metabase/test/data/sqlite.clj b/test/metabase/test/data/sqlite.clj
index 1f3407ca208934896d580a28f2e06b97e7a50101..5b2be792012a8348176dd22375f18712576438b2 100644
--- a/test/metabase/test/data/sqlite.clj
+++ b/test/metabase/test/data/sqlite.clj
@@ -32,7 +32,7 @@
(hsql/call :datetime (hx/literal (u/date->iso-8601 v))))]))))))
(u/strict-extend SQLiteDriver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(merge generic/DefaultsMixin
{:add-fk-sql (constantly nil) ; TODO - fix me
:create-db-sql (constantly nil)
diff --git a/test/metabase/test/data/sqlserver.clj b/test/metabase/test/data/sqlserver.clj
index 26eabb6c066f39c9194f9b295336887a047517ae..6802c1761057556c639204ea01b230cd88eac76a 100644
--- a/test/metabase/test/data/sqlserver.clj
+++ b/test/metabase/test/data/sqlserver.clj
@@ -75,7 +75,7 @@
(u/strict-extend SQLServerDriver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(merge generic/DefaultsMixin
{:drop-db-if-exists-sql (u/drop-first-arg drop-db-if-exists-sql)
:drop-table-if-exists-sql (u/drop-first-arg drop-table-if-exists-sql)
diff --git a/test/metabase/test/data/vertica.clj b/test/metabase/test/data/vertica.clj
index e2f7488206d7d0d97d34ea1175cd8a176f436670..9edd805a27d37a3ce9f3b64558c0d98060e415b3 100644
--- a/test/metabase/test/data/vertica.clj
+++ b/test/metabase/test/data/vertica.clj
@@ -40,7 +40,7 @@
(u/strict-extend VerticaDriver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(merge generic/DefaultsMixin
{:create-db-sql (constantly nil)
:drop-db-if-exists-sql (constantly nil)