diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2022-02-09 11:41:21 +0000 |
|---|---|---|
| committer | Neil Alexander <neilalexander@users.noreply.github.com> | 2022-02-09 11:41:21 +0000 |
| commit | cf447dd52a0015c2c5b10813ed11e59a3712607e (patch) | |
| tree | 54230605e12fb77c5d9712d23a759a80489d1d17 | |
| parent | b4687f2ed24ae4f397e039776118c6efee306fa9 (diff) | |
Revert "Fix storage bug in PSQL events table"
This reverts commit b4687f2ed24ae4f397e039776118c6efee306fa9.
| -rw-r--r-- | roomserver/storage/postgres/events_table.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/roomserver/storage/postgres/events_table.go b/roomserver/storage/postgres/events_table.go index c136f039..ece1d9e3 100644 --- a/roomserver/storage/postgres/events_table.go +++ b/roomserver/storage/postgres/events_table.go @@ -74,7 +74,7 @@ const insertEventSQL = "" + "INSERT INTO roomserver_events AS e (room_nid, event_type_nid, event_state_key_nid, event_id, reference_sha256, auth_event_nids, depth, is_rejected)" + " VALUES ($1, $2, $3, $4, $5, $6, $7, $8)" + " ON CONFLICT ON CONSTRAINT roomserver_event_id_unique DO UPDATE" + - " SET is_rejected = $8 WHERE e.event_id = $4 AND e.is_rejected = FALSE" + + " SET is_rejected = $8 WHERE e.is_rejected = FALSE" + " RETURNING event_nid, state_snapshot_nid" const selectEventSQL = "" + @@ -192,8 +192,7 @@ func (s *eventStatements) InsertEvent( ) (types.EventNID, types.StateSnapshotNID, error) { var eventNID int64 var stateNID int64 - stmt := sqlutil.TxStmt(txn, s.insertEventStmt) - err := stmt.QueryRowContext( + err := s.insertEventStmt.QueryRowContext( ctx, int64(roomNID), int64(eventTypeNID), int64(eventStateKeyNID), eventID, referenceSHA256, eventNIDsAsArray(authEventNIDs), depth, isRejected, |