diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-17 17:43:14 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-17 17:43:14 +0000 |
| commit | 649dc8a7e27a58dde6834de3ebb08897cce53098 (patch) | |
| tree | eb06e11f4d244799289bc18b56e12dabc1b013ba /synapse | |
| parent | Remove debug raise (diff) | |
| parent | Use absolute path when loading delta sql files (diff) | |
| download | synapse-649dc8a7e27a58dde6834de3ebb08897cce53098.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into failures
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/__init__.py | 5 | ||||
| -rw-r--r-- | synapse/storage/schema/delta/v13.sql (renamed from synapse/storage/schema/delta/v14.sql) | 0 |
2 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index c6e96b842f..d16e7b8fac 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -74,7 +74,9 @@ 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 = 12 +SCHEMA_VERSION = 13 + +dir_path = os.path.abspath(os.path.dirname(__file__)) class _RollbackButIsFineException(Exception): @@ -583,7 +585,6 @@ def schema_path(schema): A filesystem path pointing at a ".sql" file. """ - dir_path = os.path.dirname(__file__) schemaPath = os.path.join(dir_path, "schema", schema + ".sql") return schemaPath diff --git a/synapse/storage/schema/delta/v14.sql b/synapse/storage/schema/delta/v13.sql index e491ad5aec..e491ad5aec 100644 --- a/synapse/storage/schema/delta/v14.sql +++ b/synapse/storage/schema/delta/v13.sql |