From e52c391cd452077fc219fad0db8b9e5499251e5b Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 11 Jul 2017 14:25:46 +0100
Subject: [PATCH] Rename column to attestation_json

---
 synapse/storage/group_server.py                  | 8 ++++----
 synapse/storage/schema/delta/43/group_server.sql | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/synapse/storage/group_server.py b/synapse/storage/group_server.py
index 327d77086..105ab9920 100644
--- a/synapse/storage/group_server.py
+++ b/synapse/storage/group_server.py
@@ -168,7 +168,7 @@ class GroupServerStore(SQLBaseStore):
                         "group_id": group_id,
                         "user_id": user_id,
                         "valid_until_ms": remote_attestation["valid_until_ms"],
-                        "attestation": json.dumps(remote_attestation),
+                        "attestation_json": json.dumps(remote_attestation),
                     },
                 )
 
@@ -278,7 +278,7 @@ class GroupServerStore(SQLBaseStore):
             },
             updatevalues={
                 "valid_until_ms": attestation["valid_until_ms"],
-                "attestation": json.dumps(attestation)
+                "attestation_json": json.dumps(attestation)
             },
             desc="update_remote_attestion",
         )
@@ -294,13 +294,13 @@ class GroupServerStore(SQLBaseStore):
                 "group_id": group_id,
                 "user_id": user_id,
             },
-            retcols=("valid_until_ms", "attestation"),
+            retcols=("valid_until_ms", "attestation_json"),
             desc="get_remote_attestation",
             allow_none=True,
         )
 
         now = int(self._clock.time_msec())
         if row and now < row["valid_until_ms"]:
-            defer.returnValue(json.loads(row["attestation"]))
+            defer.returnValue(json.loads(row["attestation_json"]))
 
         defer.returnValue(None)
diff --git a/synapse/storage/schema/delta/43/group_server.sql b/synapse/storage/schema/delta/43/group_server.sql
index bfe8c2ca4..b55b0a8de 100644
--- a/synapse/storage/schema/delta/43/group_server.sql
+++ b/synapse/storage/schema/delta/43/group_server.sql
@@ -73,7 +73,7 @@ CREATE TABLE group_attestations_remote (
     group_id TEXT NOT NULL,
     user_id TEXT NOT NULL,
     valid_until_ms BIGINT NOT NULL,
-    attestation TEXT NOT NULL
+    attestation_json TEXT NOT NULL
 );
 
 CREATE INDEX group_attestations_remote_g_idx ON group_attestations_remote(group_id, user_id);