diff options
author | Erik Johnston <erik@matrix.org> | 2015-10-13 13:19:23 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-10-13 13:29:02 +0100 |
commit | f9340ea0d5346bb07489b1bd03bb90ea8f437e42 (patch) | |
tree | 3cb14e0a740aa768df674d08bb51c53970a215cb /synapse/storage/engines | |
parent | Search left rooms too (diff) | |
parent | Expose error more nicely (diff) | |
download | synapse-f9340ea0d5346bb07489b1bd03bb90ea8f437e42.tar.xz |
Merge branch 'erikj/store_engine' into erikj/search
Diffstat (limited to 'synapse/storage/engines')
-rw-r--r-- | synapse/storage/engines/postgres.py | 2 | ||||
-rw-r--r-- | synapse/storage/engines/sqlite3.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py index 4a855ffd56..7e45dabf4c 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 import prepare_database +from synapse.storage.schema_prepare import prepare_database from ._base import IncorrectDatabaseSetup diff --git a/synapse/storage/engines/sqlite3.py b/synapse/storage/engines/sqlite3.py index d18e2808d1..0eeaa45d19 100644 --- a/synapse/storage/engines/sqlite3.py +++ b/synapse/storage/engines/sqlite3.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from synapse.storage import prepare_database, prepare_sqlite3_database +from synapse.storage.schema_prepare import ( + prepare_database, prepare_sqlite3_database +) class Sqlite3Engine(object): |