Merge branch 'main' into cursor/allow-large-text-fields-in-odbc-b4c8

Author: lovasoa

Cargo.lock

@@ -359,7 +359,7 @@ async fn test_sql_file_read_utf8() -> anyhow::Result<()> {
         .execute(conn)
         .await?;
 
-    let fs = FileSystem::init("/", &db).await;
+    let fs = FileSystem::init("/", db).await;
     let actual = fs
         .read_to_string(&state, "unit test file.txt".as_ref(), false)
         .await?;

src/filesystem.rs

@@ -515,9 +515,8 @@ mod tests {
                     return false;
                 }
                 a.iter().all(|(key, value)| {
-                    b.get(key).map_or(false, |expected_value| {
-                        json_values_equal(value, expected_value)
-                    })
+                    b.get(key)
+                        .is_some_and(|expected_value| json_values_equal(value, expected_value))
                 })
             }
             _ => false,