mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-16 19:33:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks from @babolivier review comments

Browse source
This commit is contained in:
Neil Alexander 2020-01-02 14:44:24 +00:00
parent c67aa04f24
commit 96a0e09113
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
syncapi/storage/current_room_state_table.go
View file

@ -84,10 +84,12 @@ const selectStateEventSQL = "" +
"SELECT event_json FROM syncapi_current_room_state WHERE room_id = $1 AND type = $2 AND state_key = $3" "SELECT event_json FROM syncapi_current_room_state WHERE room_id = $1 AND type = $2 AND state_key = $3"
const selectEventsWithEventIDsSQL = "" + const selectEventsWithEventIDsSQL = "" +
// TODO: The session_id and transaction_id blanks are here because otherwise the rowsToStreamEvents // TODO: The session_id and transaction_id blanks are here because otherwise
// expects there to be exactly four columns. We need a better solution to this long term. // the rowsToStreamEvents expects there to be exactly four columns. We need to
// - neilalexander, 2 Jan 2020 // figure out if these really need to be in the DB, and if so, we need a
"SELECT added_at, event_json, 0 AS session_id, '' AS transaction_id FROM syncapi_current_room_state WHERE event_id = ANY($1)" // better permanent fix for this. - neilalexander, 2 Jan 2020
"SELECT added_at, event_json, 0 AS session_id, '' AS transaction_id" +
" FROM syncapi_current_room_state WHERE event_id = ANY($1)"
type currentRoomStateStatements struct { type currentRoomStateStatements struct {
upsertRoomStateStmt *sql.Stmt upsertRoomStateStmt *sql.Stmt