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:57:06 +0100
committerErik Johnston <erik@matrix.org>2015-10-13 14:03:30 +0100
commit88971fd03451205a74babc594b1730bf6d80faf1 (patch)
treede90f47ba080d217dbc62c238be5b9ba1123e242 /synapse/storage/schema
parentAdd SQLite support (diff)
parentrename schema_prepare to prepare_database (diff)
downloadsynapse-88971fd03451205a74babc594b1730bf6d80faf1.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 f9b4bba4ed..b45a5fd820 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.schema_prepare import get_statements
+from synapse.storage.prepare_database import get_statements
 from synapse.storage.engines import PostgresEngine, Sqlite3Engine
 
 import ujson