Split out the schema preparation and update logic into its own module

2 files changed, 4 insertions, 2 deletions

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

index 4a855ffd56..949396044e 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 import prepare_database
+from synapse.storage._schema_prepare import prepare_database
 
 from ._base import IncorrectDatabaseSetup
 
diff --git a/synapse/storage/engines/sqlite3.py b/synapse/storage/engines/sqlite3.py

index d18e2808d1..a66815ef2d 100644
--- a/synapse/storage/engines/sqlite3.py
+++ b/synapse/storage/engines/sqlite3.py
@@ -13,7 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from synapse.storage import prepare_database, prepare_sqlite3_database
+from synapse.storage._schema_prepare import (
+    prepare_database, prepare_sqlite3_database
+)
 
 
 class Sqlite3Engine(object):