Merge branch 'main' into integration/bump-mobc

prisma · Oct 30, 2023 · e405629 · e405629
2 parents 7278ed2 + 79b5ee0
commit e405629
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/quaint/README.md b/quaint/README.md
@@ -41,7 +41,7 @@ choice.
 
 ```sh
  > cargo build --features all
- ```
+```
 
 ### Testing
 
@@ -70,8 +70,8 @@ This requires the rust nightly channel:
 > cargo rustdoc --all-features
 ```
 
-Documentation index would be created at `$CARGO_TARGET_DIR/doc/quaint/index.html`
+Documentation index would be created at `$CARGO_TARGET_DIR/doc/quaint/index.html`.
 
 ## Security
 
-If you have a security issue to report, please contact us at [[email protected]](mailto:[email protected]?subject=[GitHub]%20Prisma%202%20Security%20Report%20Quaint)
+If you have a security issue to report, please contact us at [[email protected]](mailto:[email protected]?subject=[GitHub]%20Prisma%202%20Security%20Report%20Quaint).
diff --git a/query-engine/connectors/mongodb-query-connector/Cargo.toml b/query-engine/connectors/mongodb-query-connector/Cargo.toml
@@ -22,6 +22,7 @@ tracing-futures = "0.2"
 uuid.workspace = true
 indexmap = "1.7"
 query-engine-metrics = {path = "../../metrics"}
+cuid = { git = "https://github.com/prisma/cuid-rust", branch = "wasm32-support" }
 
 [dependencies.prisma-models]
 path = "../../prisma-models"
@@ -46,9 +47,6 @@ workspace = true
 [dependencies.serde]
 workspace = true
 
-[dependencies.cuid]
-version = "1.2"
-
 [dependencies.user-facing-errors]
 features = ["sql"]
 workspace = true
diff --git a/query-engine/connectors/sql-query-connector/Cargo.toml b/query-engine/connectors/sql-query-connector/Cargo.toml
@@ -25,6 +25,7 @@ uuid.workspace = true
 opentelemetry = { version = "0.17", features = ["tokio"] }
 tracing-opentelemetry = "0.17.3"
 quaint.workspace = true
+cuid = { git = "https://github.com/prisma/cuid-rust", branch = "wasm32-support" }
 
 [dependencies.connector-interface]
 package = "query-connector"
@@ -44,9 +45,6 @@ version = "0.4"
 features = ["derive"]
 version = "1.0"
 
-[dependencies.cuid]
-version = "1.2"
-
 [dependencies.user-facing-errors]
 features = ["sql"]
 path = "../../../libs/user-facing-errors"
diff --git a/query-engine/core/Cargo.toml b/query-engine/core/Cargo.toml
@@ -29,7 +29,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 tracing-opentelemetry = "0.17.4"
 user-facing-errors = { path = "../../libs/user-facing-errors" }
 uuid = "1"
-cuid = "1.2"
+cuid = { git = "https://github.com/prisma/cuid-rust", branch = "wasm32-support" }
 schema = { path = "../schema" }
 lru = "0.7.7"
 enumflags2 = "0.7"

diff --git a/query-engine/dmmf/Cargo.toml b/query-engine/dmmf/Cargo.toml
@@ -10,7 +10,7 @@ serde.workspace = true
 serde_json.workspace = true
 schema = { path = "../schema" }
 indexmap = { version = "1.7", features = ["serde-1"] }
-prisma-models = { path = "../prisma-models" }
+prisma-models = { path = "../prisma-models", features = ["default_generators"] }
 
 [dev-dependencies]
 expect-test = "1.2.2"

diff --git a/query-engine/prisma-models/Cargo.toml b/query-engine/prisma-models/Cargo.toml
@@ -10,13 +10,16 @@ prisma-value = { path = "../../libs/prisma-value" }
 bigdecimal = "0.3"
 thiserror = "1.0"
 
+getrandom = { version = "0.2" }
 uuid = { workspace = true, optional = true }
-cuid = { version = "1.2", optional = true }
+cuid = { git = "https://github.com/prisma/cuid-rust", branch = "wasm32-support", optional = true }
 nanoid = { version = "0.4.0", optional = true }
 chrono = { version = "0.4.6", features = ["serde"] }
 
+[target.'cfg(target_arch = "wasm32")'.dependencies.getrandom]
+version = "0.2"
+features = ["js"]
+
 [features]
-# Support for generating default UUID, CUID, nanoid and datetime values. This
-# implies random number generation works, so it won't compile on targets like
-# wasm32.
+# Support for generating default UUID, CUID, nanoid and datetime values.
 default_generators = ["uuid/v4", "cuid", "nanoid"]