s/definition/filter_json/ since definition is now used to mean a component of the filter, rather than the complete json

2 files changed, 3 insertions, 3 deletions

diff --git a/synapse/storage/filtering.py b/synapse/storage/filtering.py
index bab68a9eef..cb01c2040f 100644
--- a/synapse/storage/filtering.py
+++ b/synapse/storage/filtering.py
@@ -33,7 +33,7 @@ class FilteringStore(SQLBaseStore):
                 "user_id": user_localpart,
                 "filter_id": filter_id,
             },
-            retcol="definition",
+            retcol="filter_json",
             allow_none=False,
         )
 
@@ -57,7 +57,7 @@ class FilteringStore(SQLBaseStore):
                 filter_id = max_id + 1
 
             sql = (
-                "INSERT INTO user_filters (user_id, filter_id, definition)"
+                "INSERT INTO user_filters (user_id, filter_id, filter_json)"
                 "VALUES(?, ?, ?)"
             )
             txn.execute(sql, (user_localpart, filter_id, def_json))
diff --git a/synapse/storage/schema/filtering.sql b/synapse/storage/schema/filtering.sql
index 795aca4afd..beb39ca201 100644
--- a/synapse/storage/schema/filtering.sql
+++ b/synapse/storage/schema/filtering.sql
@@ -15,7 +15,7 @@
 CREATE TABLE IF NOT EXISTS user_filters(
   user_id TEXT,
   filter_id INTEGER,
-  definition TEXT,
+  filter_json TEXT,
   FOREIGN KEY(user_id) REFERENCES users(id)
 );