chore: merge main, fix conflicts

prisma · Nov 20, 2023 · a819ff9 · a819ff9
2 parents 3c592e1 + a82584a
commit a819ff9
Show file tree

Hide file tree

Showing 2 changed files with 131 additions and 1 deletion.
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