fix: update mongo snapshots and revert cruet change (#5674)

MongoDB tests were failing on `main` after [updating the driver to
resolve a security
issue](#5668) and
[switching to `cruet` for case
conversion](#5663). It
wasn't caught in the corresponding pull requests because we don't run
the MongoDB tests by default in PRs, they need to be opted into by using
the `/test-all` command.

Snapshots need to be updated in the MongoDB introspection tests because,
due to a [bugfix
upstream](mongodb/mongo-rust-driver#1226), the
`IndexModel` builder now builds the default index name differently (the
previous behavior was incorrect, and those quotes should not have been
present there). This only affects the `IndexModel::builder()` API which
we exclusively use in our introspection tests. There's no change in
behavior for end users.

`cruet` change needs to be reverted because it has different behavior
compared to `convert_case` in the presence of consecutive capital
letters, which leads to actual regressions in tests related to composite
types.

/test-all

Author: aqrln

Cargo.lock

@@ -64,6 +64,7 @@ chrono = "0.4"
 colored = "3"
 concat-idents = "1"
 connection-string = "0.2"
+convert_case = "0.8"
 crossbeam-channel = "0.5"
 cruet = "0.15"
 cuid = { git = "https://github.com/prisma/cuid-rust", branch = "v1.3.3-wasm32-unknown-unknown" }

Cargo.toml

@@ -20,7 +20,7 @@ bson.workspace = true
 serde_json.workspace = true
 tokio.workspace = true
 tracing.workspace = true
-cruet.workspace = true
+convert_case.workspace = true
 regex.workspace = true
 indoc.workspace = true
 

schema-engine/connectors/mongodb-schema-connector/Cargo.toml

@@ -13,7 +13,7 @@ use schema_connector::{
 
 use super::field_type::FieldType;
 use bson::{Bson, Document};
-use cruet::Inflector;
+use convert_case::{Case, Casing};
 use datamodel_renderer as renderer;
 use mongodb_schema_describer::{CollectionWalker, IndexWalker};
 use psl::datamodel_connector::constraint_names::ConstraintNames;
@@ -63,7 +63,7 @@ impl<'a> Statistics<'a> {
     fn composite_type_name(&self, model: &str, field: &str) -> Name {
         let combined: String = format!("{model}_{field}").chars().filter(|c| c.is_ascii()).collect();
 
-        let name = Name::Model(combined.to_pascal_case());
+        let name = Name::Model(combined.to_case(Case::Pascal));
 
         let name = if self.models.contains_key(&name) {
             format!("{name}_")
@@ -521,7 +521,7 @@ impl<'a> Statistics<'a> {
                         (name, field.clone())
                     };
 
-                    let type_name = format!("{container_name}_{field}").to_pascal_case();
+                    let type_name = format!("{container_name}_{field}").to_case(Case::Pascal);
                     let type_name = sanitize_string(&type_name).unwrap_or(type_name);
                     container_name.clone_from(&type_name);
 

schema-engine/connectors/mongodb-schema-connector/src/sampler/statistics.rs

@@ -257,7 +257,7 @@ fn single_column_fulltext_index() {
           age  Int
           name String
 
-          @@fulltext([name], map: "name_\"text\"")
+          @@fulltext([name], map: "name_text")
         }
     "#]];
 
@@ -295,7 +295,7 @@ fn single_column_fulltext_composite_index() {
           address CatAddress
           name    String
 
-          @@fulltext([address.street], map: "address.street_\"text\"")
+          @@fulltext([address.street], map: "address.street_text")
         }
     "#]];
 
@@ -334,7 +334,7 @@ fn single_array_column_fulltext_composite_index() {
           addresses CatAddresses[]
           name      String
 
-          @@fulltext([addresses.street], map: "addresses.street_\"text\"")
+          @@fulltext([addresses.street], map: "addresses.street_text")
         }
     "#]];
 
@@ -369,7 +369,7 @@ fn multi_column_fulltext_index() {
           name  String
           title String
 
-          @@fulltext([name, title], map: "name_\"text\"_title_\"text\"")
+          @@fulltext([name, title], map: "name_text_title_text")
         }
     "#]];
 
@@ -408,7 +408,7 @@ fn multi_column_fulltext_composite_index() {
           address CatAddress
           name    String
 
-          @@fulltext([address.city, address.street], map: "address.street_\"text\"_address.city_\"text\"")
+          @@fulltext([address.city, address.street], map: "address.street_text_address.city_text")
         }
     "#]];
 
@@ -443,7 +443,7 @@ fn multi_column_fulltext_index_with_desc_in_end() {
           name  String
           title String
 
-          @@fulltext([name, title, age(sort: Desc)], map: "name_\"text\"_title_\"text\"_age_-1")
+          @@fulltext([name, title, age(sort: Desc)], map: "name_text_title_text_age_-1")
         }
     "#]];
 
@@ -482,7 +482,7 @@ fn multi_column_fulltext_composite_index_with_desc_in_end() {
           address CatAddress
           name    String
 
-          @@fulltext([address.street, name, address.number(sort: Desc)], map: "name_\"text\"_address.street_\"text\"_address.number_-1")
+          @@fulltext([address.street, name, address.number(sort: Desc)], map: "name_text_address.street_text_address.number_-1")
         }
     "#]];
 
@@ -517,7 +517,7 @@ fn multi_column_fulltext_index_with_desc_in_beginning() {
           name  String
           title String
 
-          @@fulltext([age(sort: Desc), name, title], map: "age_-1_name_\"text\"_title_\"text\"")
+          @@fulltext([age(sort: Desc), name, title], map: "age_-1_name_text_title_text")
         }
     "#]];
 
@@ -556,7 +556,7 @@ fn multi_column_fulltext_composite_index_with_desc_in_beginning() {
           address CatAddress
           name    String
 
-          @@fulltext([address.number(sort: Desc), address.street, name], map: "address.number_-1_address.street_\"text\"_name_\"text\"")
+          @@fulltext([address.number(sort: Desc), address.street, name], map: "address.number_-1_address.street_text_name_text")
         }
     "#]];
 
@@ -591,7 +591,7 @@ fn multi_column_fulltext_index_with_asc_in_end() {
           name  String
           title String
 
-          @@fulltext([name, title, age(sort: Asc)], map: "name_\"text\"_title_\"text\"_age_1")
+          @@fulltext([name, title, age(sort: Asc)], map: "name_text_title_text_age_1")
         }
     "#]];
 
@@ -626,7 +626,7 @@ fn multi_column_fulltext_index_with_asc_in_beginning() {
           name  String
           title String
 
-          @@fulltext([age(sort: Asc), name, title], map: "age_1_name_\"text\"_title_\"text\"")
+          @@fulltext([age(sort: Asc), name, title], map: "age_1_name_text_title_text")
         }
     "#]];
 
@@ -702,7 +702,7 @@ fn fultext_index() {
           age  Int
           name String
 
-          @@fulltext([name], map: "name_\"text\"")
+          @@fulltext([name], map: "name_text")
         }
     "#]];
 
@@ -742,7 +742,7 @@ fn fultext_composite_index() {
           address CatAddress
           name    String
 
-          @@fulltext([address.street], map: "address.street_\"text\"")
+          @@fulltext([address.street], map: "address.street_text")
         }
     "#]];