mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-17 03:43:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix syncapi SQLite

Browse source
This commit is contained in:
Neil Alexander 2020-03-19 11:50:53 +00:00
parent a697a0d720
commit dc0935216d
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
syncapi/storage/sqlite3/current_room_state_table.go
View file

@ -209,9 +209,14 @@ func (s *currentRoomStateStatements) upsertRoomState(
_, containsURL = content["url"] _, containsURL = content["url"]
} }
headeredJSON, err := json.Marshal(event)
if err != nil {
return err
}
// upsert state event // upsert state event
stmt := common.TxStmt(txn, s.upsertRoomStateStmt) stmt := common.TxStmt(txn, s.upsertRoomStateStmt)
_, err := stmt.ExecContext( _, err = stmt.ExecContext(
ctx, ctx,
event.RoomID(), event.RoomID(),
event.EventID(), event.EventID(),
@ -219,7 +224,7 @@ func (s *currentRoomStateStatements) upsertRoomState(
event.Sender(), event.Sender(),
containsURL, containsURL,
*event.StateKey(), *event.StateKey(),
event.JSON(), headeredJSON,
membership, membership,
addedAt, addedAt,
) )

8
syncapi/storage/sqlite3/output_room_events_table.go
View file

@ -263,6 +263,12 @@ func (s *outputRoomEventsStatements) insertEvent(
_, containsURL = content["url"] _, containsURL = content["url"]
} }
var headeredJSON []byte
headeredJSON, err = json.Marshal(event)
if err != nil {
return
}
streamPos, err = s.streamIDStatements.nextStreamID(ctx, txn) streamPos, err = s.streamIDStatements.nextStreamID(ctx, txn)
if err != nil { if err != nil {
return return
@ -283,7 +289,7 @@ func (s *outputRoomEventsStatements) insertEvent(
streamPos, streamPos,
event.RoomID(), event.RoomID(),
event.EventID(), event.EventID(),
event.JSON(), headeredJSON,
event.Type(), event.Type(),
event.Sender(), event.Sender(),
containsURL, containsURL,