diff options
| author | David Baker <dave@matrix.org> | 2015-03-04 14:56:41 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-03-04 14:56:41 +0000 |
| commit | 92b3dc3219ccabc6997c66197a3b879dc49f5597 (patch) | |
| tree | 083acae90fadadf500918d58754a628feff86351 /synapse/storage/__init__.py | |
| parent | Use if not results rather than len, as per feedback. (diff) | |
| parent | Fix upgrade instructions (diff) | |
| download | synapse-92b3dc3219ccabc6997c66197a3b879dc49f5597.tar.xz | |
Merge branch 'develop' into pushrules2
Diffstat (limited to 'synapse/storage/__init__.py')
| -rw-r--r-- | synapse/storage/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index d16e7b8fac..d6ec446bd2 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -74,7 +74,7 @@ SCHEMAS = [ # Remember to update this number every time an incompatible change is made to # database schema files, so the users will be informed on server restarts. -SCHEMA_VERSION = 13 +SCHEMA_VERSION = 14 dir_path = os.path.abspath(os.path.dirname(__file__)) @@ -633,11 +633,11 @@ 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: + if v in (10, 14,): raise UpgradeDatabaseException( "No delta for version 10" ) - sql_script = read_schema("delta/v%d" % (v)) + sql_script = read_schema("delta/v%d" % (v,)) c.executescript(sql_script) db_conn.commit() |