summary refs log tree commit diff
path: root/synapse/storage/schema
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-13 13:19:23 +0100
committerErik Johnston <erik@matrix.org>2015-10-13 13:29:02 +0100
commitf9340ea0d5346bb07489b1bd03bb90ea8f437e42 (patch)
tree3cb14e0a740aa768df674d08bb51c53970a215cb /synapse/storage/schema
parentSearch left rooms too (diff)
parentExpose error more nicely (diff)
downloadsynapse-f9340ea0d5346bb07489b1bd03bb90ea8f437e42.tar.xz
Merge branch 'erikj/store_engine' into erikj/search
Diffstat (limited to 'synapse/storage/schema')
-rw-r--r--synapse/storage/schema/delta/24/fts.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/schema/delta/24/fts.py b/synapse/storage/schema/delta/24/fts.py
index a806f4b8d3..f9b4bba4ed 100644
--- a/synapse/storage/schema/delta/24/fts.py
+++ b/synapse/storage/schema/delta/24/fts.py
@@ -14,7 +14,7 @@
 
 import logging
 
-from synapse.storage import get_statements
+from synapse.storage.schema_prepare import get_statements
 from synapse.storage.engines import PostgresEngine, Sqlite3Engine
 
 import ujson