From 82c582076782f180c9f69a523953c3a36b57b3ac Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Fri, 17 Oct 2014 17:31:48 +0100
Subject: keep 'origin_server_ts' as 'ts' in the database to avoid needlessly
 updating schema

---
 synapse/storage/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'synapse/storage/__init__.py')

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:
-- 
cgit 1.4.1