diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-10-17 17:31:48 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-10-17 17:31:48 +0100 |
| commit | 82c582076782f180c9f69a523953c3a36b57b3ac (patch) | |
| tree | 00a79bdfe56a139cbe427ecc28bad852bdc3663d /synapse/storage/_base.py | |
| parent | SPEC-7: Rename 'ts' to 'origin_server_ts' (diff) | |
| download | synapse-82c582076782f180c9f69a523953c3a36b57b3ac.tar.xz | |
keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating schema
Diffstat (limited to 'synapse/storage/_base.py')
| -rw-r--r-- | synapse/storage/_base.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index 30c5103cdd..65a86e9056 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -354,6 +354,7 @@ class SQLBaseStore(object): d.pop("stream_ordering", None) d.pop("topological_ordering", None) d.pop("processed", None) + d["origin_server_ts"] = d.pop("ts", 0) d.update(json.loads(row_dict["unrecognized_keys"])) d["content"] = json.loads(d["content"]) @@ -361,7 +362,7 @@ class SQLBaseStore(object): if "age_ts" not in d: # For compatibility - d["age_ts"] = d["origin_server_ts"] if "origin_server_ts" in d else 0 + d["age_ts"] = d.get("origin_server_ts", 0) return self.event_factory.create_event( etype=d["type"], |