Move qe-setup crate to the query-engine directory (#3644)

It's something the client team should own. It only relies on the public API of the migration engine.
prisma · Jan 30, 2023 · 3e7962e · 3e7962e
1 parent 9f4a7f6
commit 3e7962e
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 27 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,17 +10,17 @@ members = [
   "migration-engine/core",
   "migration-engine/json-rpc-api-build",
   "migration-engine/migration-engine-tests",
-  "migration-engine/qe-setup",
-  "query-engine/connectors/query-connector",
-  "query-engine/connectors/sql-query-connector",
-  "query-engine/connectors/mongodb-query-connector",
+  "query-engine/connectors/*",
+  "query-engine/connector-test-kit-rs/qe-setup",
+  "query-engine/connector-test-kit-rs/query-engine-tests",
+  "query-engine/connector-test-kit-rs/query-test-macros",
+  "query-engine/connector-test-kit-rs/query-tests-setup",
   "query-engine/core",
   "query-engine/dmmf",
   "query-engine/metrics",
+  "query-engine/prisma-models",
   "query-engine/query-engine",
   "query-engine/query-engine-node-api",
-  "query-engine/connector-test-kit-rs/query-engine-tests",
-  "query-engine/prisma-models",
   "query-engine/request-handlers",
   "query-engine/schema",
   "query-engine/schema-builder",

diff --git a/migration-engine/qe-setup/Cargo.toml → ...connector-test-kit-rs/qe-setup/Cargo.toml b/migration-engine/qe-setup/Cargo.toml → ...connector-test-kit-rs/qe-setup/Cargo.toml
@@ -5,14 +5,14 @@ edition = "2021"
 
 [dependencies]
 psl.workspace = true
-mongodb-client = { path = "../../libs/mongodb-client" }
-migration-core = { path = "../core" }
-test-setup = { path = "../../libs/test-setup" }
+quaint.workspace = true
+mongodb-client = { path = "../../../libs/mongodb-client" }
+migration-core = { path = "../../../migration-engine/core" }
+test-setup = { path = "../../../libs/test-setup" }
 
 parking_lot = { version = "0.12", features = ["send_guard"] }
 connection-string = "*"
 enumflags2 = "*"
 mongodb = "2.3.0"
 tempfile = "3.3.0"
 url = "2"
-quaint.workspace = true
diff --git a/migration-engine/qe-setup/src/lib.rs → ...connector-test-kit-rs/qe-setup/src/lib.rs b/migration-engine/qe-setup/src/lib.rs → ...connector-test-kit-rs/qe-setup/src/lib.rs
diff --git a/migration-engine/qe-setup/src/mongodb.rs → ...ector-test-kit-rs/qe-setup/src/mongodb.rs b/migration-engine/qe-setup/src/mongodb.rs → ...ector-test-kit-rs/qe-setup/src/mongodb.rs
diff --git a/migration-engine/qe-setup/src/mssql.rs → ...nnector-test-kit-rs/qe-setup/src/mssql.rs b/migration-engine/qe-setup/src/mssql.rs → ...nnector-test-kit-rs/qe-setup/src/mssql.rs
diff --git a/migration-engine/qe-setup/src/mysql.rs → ...nnector-test-kit-rs/qe-setup/src/mysql.rs b/migration-engine/qe-setup/src/mysql.rs → ...nnector-test-kit-rs/qe-setup/src/mysql.rs
diff --git a/migration-engine/qe-setup/src/postgres.rs → ...ctor-test-kit-rs/qe-setup/src/postgres.rs b/migration-engine/qe-setup/src/postgres.rs → ...ctor-test-kit-rs/qe-setup/src/postgres.rs
diff --git a/query-engine/connector-test-kit-rs/query-tests-setup/Cargo.toml b/query-engine/connector-test-kit-rs/query-tests-setup/Cargo.toml
@@ -8,7 +8,7 @@ serde_json.workspace = true
 prisma-models = { path = "../../prisma-models" }
 lazy_static = "1.4"
 enum_dispatch = "0.3"
-qe-setup = { path = "../../../migration-engine/qe-setup" }
+qe-setup = { path = "../qe-setup" }
 request-handlers = { path = "../../request-handlers" }
 tokio.workspace = true
 query-core = { path = "../../core" }
@@ -31,24 +31,9 @@ enumflags2 = "0.7"
 hyper = { version = "0.14", features = ["full"] }
 indexmap = { version = "1.0", features = ["serde-1"] }
 query-engine-metrics = {path = "../../metrics"}
+quaint.workspace = true
 
 # Only this version is vetted, upgrade only after going through the code,
 # as this is a small crate with little user base.
 parse-hyperlinks = "0.23.3"
 strip-ansi-escapes = "0.1.1"
-
-[dependencies.quaint]
-git = "https://github.com/prisma/quaint"
-features = [
-  "bigdecimal",
-  "chrono",
-  "expose-drivers",
-  "fmt-sql",
-  "json",
-  "mssql",
-  "mysql",
-  "pooled",
-  "postgresql",
-  "sqlite",
-  "uuid",
-]