Switch INSERT + UPDATE to UPSERT

changelog.d/6375.bugfix

@@ -0,0 +1 @@
+Fix `to_device` stream ID getting reset every time Synapse restarts, which had the potential to cause unable to decrypt errors.

synapse/storage/data_stores/main/deviceinbox.py

@@ -358,21 +358,8 @@ def add_messages_txn(txn, now_ms, stream_id):
     def _add_messages_to_local_device_inbox_txn(
         self, txn, stream_id, messages_by_user_then_device
     ):
-        # Compatible method of performing an upsert
-        sql = "SELECT stream_id FROM device_max_stream_id"
-
-        txn.execute(sql)
-        rows = txn.fetchone()
-        if rows:
-            db_stream_id = rows[0]
-            if db_stream_id < stream_id:
-                # Insert the new stream_id
-                sql = "UPDATE device_max_stream_id SET stream_id = ?"
-        else:
-            # No rows, perform an insert
-            sql = "INSERT INTO device_max_stream_id (stream_id) VALUES (?)"
-
-        txn.execute(sql, (stream_id,))
+        sql = "UPDATE device_max_stream_id" " SET stream_id = ?" " WHERE stream_id < ?"
+        txn.execute(sql, (stream_id, stream_id))
 
         local_by_user_then_device = {}
         for user_id, messages_by_device in messages_by_user_then_device.items():

synapse/storage/data_stores/main/schema/delta/56/device_stream_id.sql

@@ -0,0 +1,5 @@
+INSERT INTO device_max_stream_id (stream_id)
+SELECT 0
+WHERE NOT EXISTS (
+    SELECT 1 FROM device_max_stream_id
+);