From 468c185118e637e7bc3278b255e75c530ad32b07 Mon Sep 17 00:00:00 2001 From: tty0 Date: Tue, 7 Oct 2025 09:51:14 -0700 Subject: [PATCH] consult and prioritize request_id from event over database_update (#2729) --- crates/core/src/client/messages.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/core/src/client/messages.rs b/crates/core/src/client/messages.rs index 67f3b90397b..00210077db9 100644 --- a/crates/core/src/client/messages.rs +++ b/crates/core/src/client/messages.rs @@ -280,7 +280,8 @@ impl ToProtocol for TransactionUpdateMessage { let TransactionUpdateMessage { event, database_update } = self; let update = database_update.database_update; protocol.assert_matches_format_switch(&update); - let request_id = database_update.request_id.unwrap_or(0); + let mut request_id = database_update.request_id.unwrap_or(0); + request_id = event.clone().map_or(request_id, |e| e.request_id.unwrap_or(request_id)); match update { FormatSwitch::Bsatn(update) => FormatSwitch::Bsatn(convert(event, request_id, update, |args| { Vec::from(args.get_bsatn().clone()).into()