Update rusqlite to v0.38 and vendor serde-rusqlite.

Author: ignatz

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "vendor/sqlite-vec"]
 	path = vendor/sqlite-vec
 	url = https://github.com/ignatz/sqlite-vec.git
+[submodule "vendor/serde_rusqlite"]
+	path = vendor/serde_rusqlite
+	url = https://github.com/ignatz/serde_rusqlite.git

Cargo.lock

@@ -76,15 +76,16 @@ askama = { version = "0.15.1", default-features = false, features = ["derive", "
 axum = { version = "^0.8.1", features = ["multipart"] }
 base64 = { version = "0.22.1", default-features = false, features = ["alloc", "std"] }
 env_logger = { version = "^0.11.8", default-features = false, features = ["auto-color", "humantime"] }
-libsqlite3-sys = { version = "0.35.0", default-features = false, features = ["bundled", "preupdate_hook"] }
+libsqlite3-sys = { version = "0.36.0", default-features = false, features = ["bundled", "preupdate_hook"] }
 minijinja = { version = "2.1.2", default-features = false }
 parking_lot = { version = "0.12.3", default-features = false, features = ["send_guard", "arc_lock"] }
 rand = { version = "^0.9.0" }
 reqwest = { version = "0.12.8", default-features = false, features = ["rustls-tls", "json"] }
-rusqlite = { version = "0.37.0", default-features = false, features = ["bundled", "column_decltype", "functions", "backup", "preupdate_hook"] }
+rusqlite = { version = "0.38.0", default-features = false, features = ["bundled", "cache", "column_decltype", "functions", "backup", "preupdate_hook"] }
 rust-embed = { version = "8.4.0", default-features = false, features = ["mime-guess"] }
 serde = { version = "^1.0.203", features = ["derive"] }
 serde_json = { version = "^1.0.117" }
+serde_rusqlite = { path = "vendor/serde_rusqlite" }
 sqlite-vec = { path = "vendor/sqlite-vec/bindings/rust", default-features = false }
 tokio = { version = "^1.38.0", default-features = false, features = ["macros", "net", "rt-multi-thread", "fs", "signal", "time", "sync"] }
 tracing = { version = "0.1.40", default-features = false }

Cargo.toml

@@ -421,7 +421,7 @@ struct LogFieldStorage {
   version: HttpVersion,
 
   // Response fields/properties
-  status: u64,
+  status: i64,
   latency_ms: f64,
   length: i64,
 
@@ -452,7 +452,7 @@ struct JsonLog {
   client_ip: Option<String>,
 
   // HTTP response status code.
-  status: u64,
+  status: i64,
   // latency in milliseconds with fractional microseconds.
   latency_ms: f64,
 }
@@ -490,6 +490,7 @@ impl tracing::field::Visit for LogVisitor<'_> {
   fn record_i64(&mut self, field: &Field, int: i64) {
     match field.name() {
       "length" => self.0.length = int,
+      "status" => self.0.status = int,
       name => {
         self.0.fields.insert(name.into(), int.into());
       }
@@ -498,7 +499,7 @@ impl tracing::field::Visit for LogVisitor<'_> {
 
   fn record_u64(&mut self, field: &Field, uint: u64) {
     match field.name() {
-      "status" => self.0.status = uint,
+      "status" => self.0.status = uint as i64,
       name => {
         self.0.fields.insert(name.into(), uint.into());
       }

crates/core/src/logging.rs

@@ -423,7 +423,7 @@ mod test {
 
     {
       // Bulk inserts are rolled back in a transaction is second insert fails.
-      let count_before: usize = state
+      let count_before: i64 = state
         .conn()
         .read_query_row_f("SELECT COUNT(*) FROM message", (), |row| row.get(0))
         .await
@@ -449,12 +449,13 @@ mod test {
       .await;
       assert!(response.is_err(), "{response:?}");
 
-      let count_after: usize = state
+      let count_after: i64 = state
         .conn()
         .read_query_row_f("SELECT COUNT(*) FROM message", (), |row| row.get(0))
         .await
         .unwrap()
         .unwrap();
+
       assert_eq!(count_before, count_after);
     }
 

crates/core/src/records/create_record.rs

@@ -213,7 +213,7 @@ impl PerConnectionState {
           lock.remove(&id.table_name);
 
           if lock.is_empty() {
-            conn.preupdate_hook(NO_HOOK);
+            conn.preupdate_hook(NO_HOOK).expect("owned conn");
           }
         }
       });
@@ -224,59 +224,63 @@ impl PerConnectionState {
     let conn = api.conn().clone();
     let state = self.clone();
 
-    api.conn().write_lock().preupdate_hook(Some(
-      move |action: Action, db: &str, table_name: &str, case: &PreUpdateCase| {
-        let action: RecordAction = match action {
-          Action::SQLITE_UPDATE | Action::SQLITE_INSERT | Action::SQLITE_DELETE => action.into(),
-          a => {
-            error!("Unknown action: {a:?}");
+    api
+      .conn()
+      .write_lock()
+      .preupdate_hook(Some(
+        move |action: Action, db: &str, table_name: &str, case: &PreUpdateCase| {
+          let action: RecordAction = match action {
+            Action::SQLITE_UPDATE | Action::SQLITE_INSERT | Action::SQLITE_DELETE => action.into(),
+            a => {
+              error!("Unknown action: {a:?}");
+              return;
+            }
+          };
+
+          let Some(rowid) = extract_row_id(case) else {
+            error!("Failed to extract row id");
             return;
-          }
-        };
+          };
 
-        let Some(rowid) = extract_row_id(case) else {
-          error!("Failed to extract row id");
-          return;
-        };
+          let qualified_table_name = QualifiedName {
+            name: table_name.to_string(),
+            database_schema: Some(db.to_string()),
+          };
 
-        let qualified_table_name = QualifiedName {
-          name: table_name.to_string(),
-          database_schema: Some(db.to_string()),
-        };
+          // If there are no matching subscriptions, skip.
+          {
+            let lock = state.subscriptions.read();
+            let Some(subscriptions) = lock.get(&qualified_table_name).map(|r| r.read()) else {
+              return;
+            };
 
-        // If there are no matching subscriptions, skip.
-        {
-          let lock = state.subscriptions.read();
-          let Some(subscriptions) = lock.get(&qualified_table_name).map(|r| r.read()) else {
-            return;
-          };
+            if subscriptions.table.is_empty() && !subscriptions.record.contains_key(&rowid) {
+              return;
+            }
+          }
 
-          if subscriptions.table.is_empty() && !subscriptions.record.contains_key(&rowid) {
+          let Some(record_values) = extract_record_values(case) else {
+            error!("Failed to extract values");
             return;
-          }
-        }
+          };
 
-        let Some(record_values) = extract_record_values(case) else {
-          error!("Failed to extract values");
-          return;
-        };
+          let s = ContinuationState {
+            state: state.clone(),
+            table_name: qualified_table_name,
+            action,
+            rowid,
+            record_values,
+          };
 
-        let s = ContinuationState {
-          state: state.clone(),
-          table_name: qualified_table_name,
-          action,
-          rowid,
-          record_values,
-        };
-
-        // TODO: Optimization: in cases where there's only table-level access restrictions, we
-        // could avoid the continuation and even dispatch the subscription handling to a
-        // different thread entirely to take more work off the SQLite thread.
-        conn.call_and_forget(move |conn| {
-          hook_continuation(conn, s);
-        });
-      },
-    ));
+          // TODO: Optimization: in cases where there's only table-level access restrictions, we
+          // could avoid the continuation and even dispatch the subscription handling to a
+          // different thread entirely to take more work off the SQLite thread.
+          conn.call_and_forget(move |conn| {
+            hook_continuation(conn, s);
+          });
+        },
+      ))
+      .expect("owned conn");
   }
 
   async fn add_record_subscription(
@@ -408,9 +412,9 @@ impl PerConnectionState {
 impl Drop for PerConnectionState {
   fn drop(&mut self) {
     if let Some(first) = self.record_apis.read().values().nth(0) {
-      first
-        .conn()
-        .call_and_forget(|conn| conn.preupdate_hook(NO_HOOK));
+      first.conn().call_and_forget(|conn| {
+        conn.preupdate_hook(NO_HOOK).expect("owned conn");
+      });
     }
   }
 }
@@ -643,7 +647,7 @@ fn hook_continuation(conn: &rusqlite::Connection, s: ContinuationState) {
     let mut subscriptions = state.subscriptions.write();
     subscriptions.remove(&table_name);
     if subscriptions.is_empty() {
-      conn.preupdate_hook(NO_HOOK);
+      conn.preupdate_hook(NO_HOOK).expect("owned conn");
     }
 
     return;
@@ -753,7 +757,7 @@ fn hook_continuation(conn: &rusqlite::Connection, s: ContinuationState) {
       if lock.get(&table_name).is_some_and(|e| e.read().is_empty()) {
         lock.remove(&table_name);
         if lock.is_empty() {
-          conn.preupdate_hook(NO_HOOK);
+          conn.preupdate_hook(NO_HOOK).expect("owned conn");
         }
       }
     });

crates/core/src/records/subscribe.rs

@@ -20,7 +20,7 @@ log = { version = "^0.4.21", default-features = false }
 parking_lot = { workspace = true }
 rusqlite = { workspace = true }
 serde = { workspace = true }
-serde_rusqlite = "0.40"
+serde_rusqlite = { workspace = true }
 thiserror = "2.0.12"
 tokio = { workspace = true }