qe: fix mongo logging for updateMany

query-engine/connector-test-kit-rs/query-engine-tests/tests/new/regressions/max_integer.rs

@@ -19,15 +19,15 @@ mod max_integer {
     const I16_OVERFLOW_MAX: i64 = (i16::MAX as i64) + 1;
     const I16_OVERFLOW_MIN: i64 = (i16::MIN as i64) - 1;
 
-    const I24_OVERFLOW_MAX: i64 = (8388607 as i64) + 1;
-    const I24_OVERFLOW_MIN: i64 = (-8388608 as i64) - 1;
+    const I24_OVERFLOW_MAX: i64 = 8388607 + 1;
+    const I24_OVERFLOW_MIN: i64 = -8388608 - 1;
 
     const I32_OVERFLOW_MAX: i64 = (i32::MAX as i64) + 1;
     const I32_OVERFLOW_MIN: i64 = (i32::MIN as i64) - 1;
 
     const U8_OVERFLOW_MAX: i64 = (u8::MAX as i64) + 1;
     const U16_OVERFLOW_MAX: i64 = (u16::MAX as i64) + 1;
-    const U24_OVERFLOW_MAX: i64 = (16777215 as i64) + 1;
+    const U24_OVERFLOW_MAX: i64 = 16777215 + 1;
     const U32_OVERFLOW_MAX: i64 = (u32::MAX as i64) + 1;
     const OVERFLOW_MIN: i8 = -1;
 

query-engine/connector-test-kit-rs/query-engine-tests/tests/new/regressions/mod.rs

@@ -12,6 +12,7 @@ mod prisma_14696;
 mod prisma_14703;
 mod prisma_15204;
 mod prisma_15264;
+mod prisma_15467;
 mod prisma_15581;
 mod prisma_15607;
 mod prisma_5952;

query-engine/connector-test-kit-rs/query-engine-tests/tests/new/regressions/prisma_15467.rs

@@ -0,0 +1,90 @@
+use query_engine_tests::*;
+
+#[test_suite(schema(schema), only(MongoDb))]
+mod mongodb {
+    use indoc::indoc;
+
+    fn schema() -> String {
+        let schema = indoc! {
+            r#"
+            model Standing {
+                id String @id @default(auto()) @map("_id") @test.ObjectId
+                leagueId Int
+                teamId Int
+                awayLosses Int                
+            }
+            "#
+        };
+        schema.to_owned()
+    }
+
+    #[connector_test]
+    async fn update_many_log_output(mut runner: Runner) -> TestResult<()> {
+        let insert_one_standing = r#"
+        mutation {
+            createOneStanding(data:{leagueId: 0, teamId: 0, awayLosses: 0}) {
+                id
+            }
+        }"#;
+
+        let res = run_query_json!(&runner, insert_one_standing);
+        let object_id = &res["data"]["createOneStanding"]["id"];
+
+        dbg!(object_id);
+        let _ = runner.get_logs().await;
+        run_query!(
+            &runner,
+            format!(
+                r#"
+                mutation {{
+                    updateManyStanding(data:{{awayLosses:{{set: 0}}, teamId:{{set: 972030012}}, leagueId:{{set: 2363725}}}}, where:{{id: {{equals: {} }}}}) {{
+                        count
+                    }}
+                }}
+                "#,
+                object_id
+            )
+        );
+        let logs = runner.get_logs().await;
+        let last_log_line = logs.last().unwrap();
+        let expected = format!(
+            r##"db.Standing.updateMany({{
+    _id: {{
+        $in: [
+            ObjectId({}),
+        ],
+    }},
+}}, [
+{{
+    $set: {{
+        leagueId: {{
+            $literal: 2363725,
+        }},
+    }},
+}},
+{{
+    $set: {{
+        teamId: {{
+            $literal: 972030012,
+        }},
+    }},
+}},
+{{
+    $set: {{
+        awayLosses: {{
+            $literal: 0,
+        }},
+    }},
+}}])"##,
+            object_id
+        );
+
+        assert!(
+            last_log_line.contains(expected.as_str()),
+            "{} should have contained {}",
+            last_log_line,
+            expected
+        );
+        Ok(())
+    }
+}

query-engine/connector-test-kit-rs/query-tests-setup/src/logging.rs

@@ -53,7 +53,7 @@ fn create_env_filter(log_queries: bool, qe_log_level: &str) -> EnvFilter {
         .add_directive(format!("query_core={}", &qe_log_level).parse().unwrap())
         .add_directive(format!("query_connector={}", &qe_log_level).parse().unwrap())
         .add_directive(format!("sql_query_connector={}", &qe_log_level).parse().unwrap())
-        .add_directive(format!("mongodb_query_connector={}", &qe_log_level).parse().unwrap());
+        .add_directive("mongodb_query_connector=debug".parse().unwrap());
 
     if log_queries {
         filter = filter.add_directive("quaint[{is_query}]=trace".parse().unwrap());

query-engine/connectors/mongodb-query-connector/src/logger.rs

@@ -170,8 +170,12 @@ pub(crate) fn log_update_many_vec(coll: &str, filter: &Document, docs: &[Documen
         write!(&mut buffer, ", [").unwrap();
     }
 
-    for doc in docs {
-        fmt_doc(&mut buffer, doc, 1).unwrap();
+    if let Some((last, docs)) = docs.split_last() {
+        for doc in docs {
+            fmt_doc(&mut buffer, doc, 1).unwrap();
+            writeln!(&mut buffer, ",").unwrap();
+        }
+        fmt_doc(&mut buffer, last, 1).unwrap();
     }
 
     write!(&mut buffer, "])").unwrap();