Always set event_stream_ordering

matrix-org · Sep 12, 2022 · 3814eb8 · 3814eb8
1 parent b6e8321
commit 3814eb8
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/synapse/storage/databases/main/receipts.py b/synapse/storage/databases/main/receipts.py
@@ -664,14 +664,6 @@ def _insert_linearized_receipt_txn(
             self._receipts_stream_cache.entity_has_changed, room_id, stream_id
         )
 
-        upsert_values: Dict[str, Any] = {
-            "stream_id": stream_id,
-            "event_id": event_id,
-            "data": json_encoder.encode(data),
-        }
-        if stream_ordering is not None:
-            upsert_values["event_stream_ordering"] = stream_ordering
-
         self.db_pool.simple_upsert_txn(
             txn,
             table="receipts_linearized",
@@ -680,7 +672,12 @@ def _insert_linearized_receipt_txn(
                 "receipt_type": receipt_type,
                 "user_id": user_id,
             },
-            values=upsert_values,
+            values={
+                "stream_id": stream_id,
+                "event_id": event_id,
+                "event_stream_ordering": stream_ordering,
+                "data": json_encoder.encode(data),
+            },
             # receipts_linearized has a unique constraint on
             # (user_id, room_id, receipt_type), so no need to lock
             lock=False,