diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2023-11-17 08:43:47 -0500 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2023-11-17 08:43:47 -0500 |
| commit | bdb0cbc5cafb40f6d4920caac763feeeff0f60cf (patch) | |
| tree | fcb582ba48812bbb63cf48cbaf82afead39a0cf5 /synapse | |
| parent | Update admin user API return types in docs. (#16654) (diff) | |
| parent | Tweaks from review. (diff) | |
| download | synapse-bdb0cbc5cafb40f6d4920caac763feeeff0f60cf.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/databases/main/pusher.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/databases/main/pusher.py b/synapse/storage/databases/main/pusher.py index a6a1671bd6..8f36cfce12 100644 --- a/synapse/storage/databases/main/pusher.py +++ b/synapse/storage/databases/main/pusher.py @@ -601,7 +601,7 @@ class PusherBackgroundUpdatesStore(SQLBaseStore): (last_pusher_id, batch_size), ) - rows = txn.fetchall() + rows = cast(List[Tuple[int, Optional[str], Optional[str]]], txn.fetchall()) if len(rows) == 0: return 0 @@ -617,7 +617,7 @@ class PusherBackgroundUpdatesStore(SQLBaseStore): txn=txn, table="pushers", key_names=("id",), - key_values=[row[0] for row in rows], + key_values=[(row[0],) for row in rows], value_names=("device_id", "access_token"), # If there was already a device_id on the pusher, we only want to clear # the access_token column, so we keep the existing device_id. Otherwise, |