diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-13 13:57:06 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-13 14:03:30 +0100 |
| commit | 88971fd03451205a74babc594b1730bf6d80faf1 (patch) | |
| tree | de90f47ba080d217dbc62c238be5b9ba1123e242 /synapse | |
| parent | Add SQLite support (diff) | |
| parent | rename schema_prepare to prepare_database (diff) | |
| download | synapse-88971fd03451205a74babc594b1730bf6d80faf1.tar.xz | |
Merge branch 'erikj/store_engine' into erikj/search
Diffstat (limited to 'synapse')
| -rwxr-xr-x | synapse/app/homeserver.py | 2 | ||||
| -rw-r--r-- | synapse/storage/engines/postgres.py | 2 | ||||
| -rw-r--r-- | synapse/storage/engines/sqlite3.py | 2 | ||||
| -rw-r--r-- | synapse/storage/prepare_database.py (renamed from synapse/storage/schema_prepare.py) | 0 | ||||
| -rw-r--r-- | synapse/storage/schema/delta/24/fts.py | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index b284d07cf0..af53acb369 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -36,7 +36,7 @@ if __name__ == '__main__': from synapse.storage.engines import create_engine, IncorrectDatabaseSetup from synapse.storage import are_all_users_on_domain -from synapse.storage.schema_prepare import UpgradeDatabaseException +from synapse.storage.prepare_database import UpgradeDatabaseException from synapse.server import HomeServer diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py index 7e45dabf4c..98d66e0a86 100644 --- a/synapse/storage/engines/postgres.py +++ b/synapse/storage/engines/postgres.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from synapse.storage.schema_prepare import prepare_database +from synapse.storage.prepare_database import prepare_database from ._base import IncorrectDatabaseSetup diff --git a/synapse/storage/engines/sqlite3.py b/synapse/storage/engines/sqlite3.py index 0eeaa45d19..bad3b5c5ac 100644 --- a/synapse/storage/engines/sqlite3.py +++ b/synapse/storage/engines/sqlite3.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from synapse.storage.schema_prepare import ( +from synapse.storage.prepare_database import ( prepare_database, prepare_sqlite3_database ) diff --git a/synapse/storage/schema_prepare.py b/synapse/storage/prepare_database.py index 1ddf55be4d..1ddf55be4d 100644 --- a/synapse/storage/schema_prepare.py +++ b/synapse/storage/prepare_database.py diff --git a/synapse/storage/schema/delta/24/fts.py b/synapse/storage/schema/delta/24/fts.py index f9b4bba4ed..b45a5fd820 100644 --- a/synapse/storage/schema/delta/24/fts.py +++ b/synapse/storage/schema/delta/24/fts.py @@ -14,7 +14,7 @@ import logging -from synapse.storage.schema_prepare import get_statements +from synapse.storage.prepare_database import get_statements from synapse.storage.engines import PostgresEngine, Sqlite3Engine import ujson |