Backport fixes to sqlite upgrade from develop (#6578)

* commit '4caab0e95': Backport fixes to sqlite upgrade from develop (#6578)
matrix-org · Mar 20, 2020 · b7059be · b7059be
2 parents efd80e0 + 4caab0e
commit b7059be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/changelog.d/6578.bugfix b/changelog.d/6578.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in Synapse 1.7.0 which caused an error on startup when upgrading from versions before 1.3.0.
diff --git a/synapse/storage/engines/sqlite.py b/synapse/storage/engines/sqlite.py
@@ -16,6 +16,8 @@
 import struct
 import threading
 
+from synapse.storage.prepare_database import prepare_database
+
 
 class Sqlite3Engine(object):
     single_threaded = True
@@ -60,10 +62,6 @@ def convert_param_style(self, sql):
         return sql
 
     def on_new_connection(self, db_conn):
-
-        # We need to import here to avoid an import loop.
-        from synapse.storage.prepare_database import prepare_database
-
         if self._is_in_memory:
             # In memory databases need to be rebuilt each time. Ideally we'd
             # reuse the same connection as we do when starting up, but that
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix a bug introduced in Synapse 1.7.0 which caused an error on startup when upgrading from versions before 1.3.0.