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

Fix conflict statements

Browse source
This commit is contained in:
Neil Alexander 2021-04-20 15:56:49 +01:00
parent dc056f7e40
commit f858b5ac7c
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roomserver/storage/postgres/state_block_table.go
View file

@ -49,7 +49,7 @@ CREATE TABLE IF NOT EXISTS roomserver_state_block (
const insertStateDataSQL = "" + const insertStateDataSQL = "" +
"INSERT INTO roomserver_state_block (state_block_hash, event_nids)" + "INSERT INTO roomserver_state_block (state_block_hash, event_nids)" +
" VALUES ($1, $2)" + " VALUES ($1, $2)" +
" ON CONFLICT (event_nids) DO UPDATE SET event_nids=$2" + " ON CONFLICT (state_block_hash) DO UPDATE SET event_nids=$2" +
" RETURNING state_block_nid" " RETURNING state_block_nid"
const bulkSelectStateBlockEntriesSQL = "" + const bulkSelectStateBlockEntriesSQL = "" +

2
roomserver/storage/postgres/state_snapshot_table.go
View file

@ -50,7 +50,7 @@ CREATE TABLE IF NOT EXISTS roomserver_state_snapshots (
const insertStateSQL = "" + const insertStateSQL = "" +
"INSERT INTO roomserver_state_snapshots (state_snapshot_hash, room_nid, state_block_nids)" + "INSERT INTO roomserver_state_snapshots (state_snapshot_hash, room_nid, state_block_nids)" +
" VALUES ($1, $2, $3)" + " VALUES ($1, $2, $3)" +
" ON CONFLICT (room_nid, state_block_nids) DO UPDATE SET room_nid=$2" + " ON CONFLICT (state_snapshot_hash) DO UPDATE SET room_nid=$2" +
// Performing an update, above, ensures that the RETURNING statement // Performing an update, above, ensures that the RETURNING statement
// below will always return a valid state snapshot ID // below will always return a valid state snapshot ID
" RETURNING state_snapshot_nid" " RETURNING state_snapshot_nid"