Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 21:24:51 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into storage_transactions

Browse source 
Conflicts:
	synapse/api/auth.py
	synapse/handlers/room.py
	synapse/storage/__init__.py
This commit is contained in:
Mark Haines 2014-08-26 16:07:05 +01:00
commit 4b63b06cad
74 changed files with 3467 additions and 870 deletions
Download patch file Download diff file Expand all files Collapse all files

5
synapse/storage/_base.py
View file

@ -296,6 +296,11 @@ class SQLBaseStore(object):
def _parse_event_from_row(self, row_dict):
d = copy.deepcopy({k: v for k, v in row_dict.items() if v})
d.pop("stream_ordering", None)
d.pop("topological_ordering", None)
d.pop("processed", None)
d.update(json.loads(row_dict["unrecognized_keys"]))
d["content"] = json.loads(d["content"])
del d["unrecognized_keys"]