Merge branch 'erikj/store_engine' into erikj/search

4 files changed, 3 insertions, 3 deletions

diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py

index 7e45dabf4c..98d66e0a86 100644
--- a/synapse/storage/engines/postgres.py
+++ b/synapse/storage/engines/postgres.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from synapse.storage.schema_prepare import prepare_database
+from synapse.storage.prepare_database import prepare_database
 
 from ._base import IncorrectDatabaseSetup
 
diff --git a/synapse/storage/engines/sqlite3.py b/synapse/storage/engines/sqlite3.py

index 0eeaa45d19..bad3b5c5ac 100644
--- a/synapse/storage/engines/sqlite3.py
+++ b/synapse/storage/engines/sqlite3.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from synapse.storage.schema_prepare import (
+from synapse.storage.prepare_database import (
     prepare_database, prepare_sqlite3_database
 )
 
diff --git a/synapse/storage/schema_prepare.py b/synapse/storage/prepare_database.py

index 1ddf55be4d..1ddf55be4d 100644
--- a/synapse/storage/schema_prepare.py
+++ b/synapse/storage/prepare_database.py
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