From f5cf7ac25b311fda8a2d553f07437b3648c66f6c Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Fri, 17 Oct 2014 17:12:25 +0100
Subject: SPEC-7: Rename 'ts' to 'origin_server_ts'

---
 synapse/storage/schema/pdu.sql          | 2 +-
 synapse/storage/schema/transactions.sql | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'synapse/storage/schema')

diff --git a/synapse/storage/schema/pdu.sql b/synapse/storage/schema/pdu.sql
index 16e111a56c..5cc8669912 100644
--- a/synapse/storage/schema/pdu.sql
+++ b/synapse/storage/schema/pdu.sql
@@ -18,7 +18,7 @@ CREATE TABLE IF NOT EXISTS pdus(
     origin TEXT, 
     context TEXT,
     pdu_type TEXT,
-    ts INTEGER,
+    origin_server_ts INTEGER,
     depth INTEGER DEFAULT 0 NOT NULL,
     is_state BOOL, 
     content_json TEXT,
diff --git a/synapse/storage/schema/transactions.sql b/synapse/storage/schema/transactions.sql
index 88e3e4e04d..5f8d01327a 100644
--- a/synapse/storage/schema/transactions.sql
+++ b/synapse/storage/schema/transactions.sql
@@ -16,7 +16,7 @@
 CREATE TABLE IF NOT EXISTS received_transactions(
     transaction_id TEXT, 
     origin TEXT, 
-    ts INTEGER,
+    origin_server_ts INTEGER,
     response_code INTEGER,
     response_json TEXT,
     has_been_referenced BOOL default 0, -- Whether thishas been referenced by a prev_tx
@@ -35,7 +35,7 @@ CREATE TABLE IF NOT EXISTS sent_transactions(
     destination TEXT,
     response_code INTEGER DEFAULT 0,
     response_json TEXT,
-    ts INTEGER
+    origin_server_ts INTEGER
 );
 
 CREATE INDEX IF NOT EXISTS sent_transaction_dest ON sent_transactions(destination);
-- 
cgit 1.4.1