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/federation/units.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'synapse/federation')

diff --git a/synapse/federation/units.py b/synapse/federation/units.py
index dccac2aca7..b2fb964180 100644
--- a/synapse/federation/units.py
+++ b/synapse/federation/units.py
@@ -118,6 +118,7 @@ class Pdu(JsonEncodedObject):
         """
         if pdu_tuple:
             d = copy.copy(pdu_tuple.pdu_entry._asdict())
+            d["origin_server_ts"] = d.pop("ts")
 
             d["content"] = json.loads(d["content_json"])
             del d["content_json"]
-- 
cgit 1.5.1