diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-12-16 17:29:49 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-12-16 17:29:49 +0000 |
| commit | 56db465047c2906a78eccdd63b2fa18d72903a66 (patch) | |
| tree | bdd082c04fd0c02b4d732bf8ea6e4dd559d84b51 /synapse/storage/__init__.py | |
| parent | SYN-142: Use a default log file 'homeserver.log' so people get logging by def... (diff) | |
| parent | Change upgrade script to not check hashes or signatures (diff) | |
| download | synapse-56db465047c2906a78eccdd63b2fa18d72903a66.tar.xz | |
Merge branch 'release-v0.6.0' into develop
Diffstat (limited to 'synapse/storage/__init__.py')
| -rw-r--r-- | synapse/storage/__init__.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index c051f33a5c..60c2d67425 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -66,7 +66,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 = 9 +SCHEMA_VERSION = 10 class _RollbackButIsFineException(Exception): @@ -446,6 +446,14 @@ def read_schema(schema): return schema_file.read() +class PrepareDatabaseException(Exception): + pass + + +class UpgradeDatabaseException(PrepareDatabaseException): + pass + + def prepare_database(db_conn): """ Set up all the dbs. Since all the *.sql have IF NOT EXISTS, so we don't have to worry about overwriting existing content. @@ -470,6 +478,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) |