chore: merge main, fix conflicts

prisma · Nov 20, 2023 · a82584a · a82584a
2 parents 2c70d12 + ebb702b
commit a82584a
Show file tree

Hide file tree

Showing 3 changed files with 133 additions and 3 deletions.
diff --git a/query-engine/query-engine-wasm/Cargo.toml b/query-engine/query-engine-wasm/Cargo.toml
@@ -15,10 +15,10 @@ user-facing-errors = { path = "../../libs/user-facing-errors" }
 psl.workspace = true
 prisma-models = { path = "../prisma-models" }
 quaint = { path = "../../quaint" }
-query-connector = { path = "../connectors/query-connector" }
+request-handlers = { path = "../request-handlers", default-features = false, features = ["sql", "driver-adapters"] }
+connector = { path = "../connectors/query-connector", package = "query-connector" }
 sql-query-connector = { path = "../connectors/sql-query-connector" }
 query-core = { path = "../core" }
-request-handlers = { path = "../request-handlers", default-features = false, features = ["sql", "driver-adapters"] }
 
 thiserror = "1"
 connection-string.workspace = true 

diff --git a/query-engine/query-engine-wasm/pnpm-lock.yaml b/query-engine/query-engine-wasm/pnpm-lock.yaml
diff --git a/query-engine/request-handlers/Cargo.toml b/query-engine/request-handlers/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 prisma-models = { path = "../prisma-models" }
-query-core = { path = "../core" }
+query-core = { path = "../core", features = ["metrics"] }
 user-facing-errors = { path = "../../libs/user-facing-errors" }
 quaint = { path = "../../quaint" }
 psl.workspace = true