Skip to content
Snippets Groups Projects
Commit 2f9bc079 authored by Cam Saül's avatar Cam Saül Committed by GitHub
Browse files

Merge pull request #5230 from metabase/rename-IGenericSQLDatasetLoader

Rename IGenericSQLDatasetLoader -> IGenericSQLTestExtensions
parents 25721e5e 78609bed
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
......@@ -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!}))
......
......@@ -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)
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment