OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix syntax error in run_upgrade for schema 57 (#6728) 

Fix #6727
Related #6655

Co-authored-by: Erik Johnston <erikj@jki.re>
pull/6730/head
Satsuki Yanagi 2020-01-17 23:30:35 +09:00 committed by Erik Johnston
parent 3b72bb780a
commit 722b4f302d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/6728.bugfix Normal file
View File

@ -0,0 +1 @@
Fix a bug causing `ValueError: unsupported format character ''' (0x27) at index 312` error when running the schema 57 upgrade script.

7
synapse/storage/data_stores/main/schema/delta/57/local_current_membership.py
View File

@ -56,7 +56,7 @@ def run_upgrade(cur, database_engine, config, *args, **kwargs):
INSERT INTO local_current_membership (room_id, user_id, event_id, membership)
SELECT c.room_id, state_key AS user_id, event_id, c.membership
FROM current_state_events AS c
WHERE type = 'm.room.member' AND c.membership IS NOT NULL AND state_key like '%' || ?
WHERE type = 'm.room.member' AND c.membership IS NOT NULL AND state_key LIKE ?
"""
else:
# We can't rely on the membership column, so we need to join against
@ -66,9 +66,10 @@ def run_upgrade(cur, database_engine, config, *args, **kwargs):
SELECT c.room_id, state_key AS user_id, event_id, r.membership
FROM current_state_events AS c
INNER JOIN room_memberships AS r USING (event_id)
WHERE type = 'm.room.member' and state_key like '%' || ?
WHERE type = 'm.room.member' AND state_key LIKE ?
"""
cur.execute(sql, (config.server_name,))
sql = database_engine.convert_param_style(sql)
cur.execute(sql, ("%:" + config.server_name,))
cur.execute(
"CREATE UNIQUE INDEX local_current_membership_idx ON local_current_membership(user_id, room_id)"