Skip to content

Commit 974a60e

Browse files
committed
fixup! sqlite: store data on received room key bundles
1 parent 237bba5 commit 974a60e

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
CREATE TABLE "received_room_key_bundle"
22
(
3-
"room_id" BLOB NOT NULL,
4-
"sender_user" BLOB NOT NULL,
5-
"bundle_data" BLOB NOT NULL
3+
"room_id" BLOB NOT NULL,
4+
"sender_user_id" BLOB NOT NULL,
5+
"bundle_data" BLOB NOT NULL
66
);
77

88
CREATE UNIQUE INDEX "received_room_key_bundle_room_id_user_id_idx"
9-
ON "received_room_key_bundle" ("room_id", "sender_user");
9+
ON "received_room_key_bundle" ("room_id", "sender_user_id");

crates/matrix-sdk-sqlite/src/crypto_store.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -500,14 +500,14 @@ impl SqliteConnectionExt for rusqlite::Connection {
500500
fn set_received_room_key_bundle(
501501
&self,
502502
room_id: &[u8],
503-
sender_user: &[u8],
503+
sender_user_id: &[u8],
504504
data: &[u8],
505505
) -> rusqlite::Result<()> {
506506
self.execute(
507-
"INSERT INTO received_room_key_bundle(room_id, sender_user, bundle_data)
507+
"INSERT INTO received_room_key_bundle(room_id, sender_user_id, bundle_data)
508508
VALUES (?1, ?2, ?3)
509-
ON CONFLICT (room_id, sender_user) DO UPDATE SET bundle_data = ?3",
510-
(room_id, sender_user, data),
509+
ON CONFLICT (room_id, sender_user_id) DO UPDATE SET bundle_data = ?3",
510+
(room_id, sender_user_id, data),
511511
)?;
512512
Ok(())
513513
}

0 commit comments

Comments
 (0)