summary refs log tree commit diff
path: root/synapse/storage/__init__.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-17 17:31:48 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-17 17:31:48 +0100
commit82c582076782f180c9f69a523953c3a36b57b3ac (patch)
tree00a79bdfe56a139cbe427ecc28bad852bdc3663d /synapse/storage/__init__.py
parentSPEC-7: Rename 'ts' to 'origin_server_ts' (diff)
downloadsynapse-82c582076782f180c9f69a523953c3a36b57b3ac.tar.xz
keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating schema
Diffstat (limited to 'synapse/storage/__init__.py')
-rw-r--r--synapse/storage/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 6dadeb8cce..c8e0efb18f 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -155,6 +155,8 @@ class DataStore(RoomMemberStore, RoomStore,
 
         cols["unrecognized_keys"] = json.dumps(unrec_keys)
 
+        cols["ts"] = cols.pop("origin_server_ts")
+
         logger.debug("Persisting: %s", repr(cols))
 
         if pdu.is_state: