diff options
author | Erik Johnston <erik@matrix.org> | 2014-12-16 14:44:53 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-12-16 14:44:53 +0000 |
commit | b3c793e362004f736c84388008a2aad07f61a492 (patch) | |
tree | 6cad4249f5a41fd3aafbf7526bfafcf97db0acdd | |
parent | Bump UPGRADES and CHANGES (diff) | |
download | synapse-b3c793e362004f736c84388008a2aad07f61a492.tar.xz |
Do run all deltas up to missing delta 10
-rw-r--r-- | synapse/storage/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index 2e97bbab3b..2a683b25f7 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -550,10 +550,6 @@ def prepare_database(db_conn): "Cannot use this database as it is too " + "new for the server to understand" ) - elif user_version < 10: - raise UpgradeDatabaseException( - "No delta for versions less than 10" - ) elif user_version < SCHEMA_VERSION: logger.info( "Upgrading database from version %d", @@ -562,6 +558,10 @@ def prepare_database(db_conn): # Run every version since after the current version. for v in range(user_version + 1, SCHEMA_VERSION + 1): + if v == 10: + raise UpgradeDatabaseException( + "No delta for version 10" + ) sql_script = read_schema("delta/v%d" % (v)) c.executescript(sql_script) |