diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-26 13:55:37 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-26 13:55:37 +0100 |
| commit | 485bb64ddbcc372c5ed3d74190eda06f02cb3f82 (patch) | |
| tree | e89ec33366b907bea794e9140f962d2951b29ff9 /synapse/storage/_base.py | |
| parent | Use new StreamToken in pagination config (diff) | |
| parent | Add the ability to turn on the twisted manhole telnet service. (diff) | |
| download | synapse-485bb64ddbcc372c5ed3d74190eda06f02cb3f82.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'synapse/storage/_base.py')
| -rw-r--r-- | synapse/storage/_base.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index 36cc57c1b8..75aab2d3b9 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -294,6 +294,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"] |