diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-13 14:01:15 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-13 14:01:15 +0100 |
| commit | 7ec9be9c53bb7f5f8b2ef07cf499c232c6137b39 (patch) | |
| tree | 04a46e242026f2e6b4379b13e3332b9b61cf80ed /synapse/storage/engines | |
| parent | Merge pull request #299 from stevenhammerton/sh-cas-required-attribute (diff) | |
| parent | rename schema_prepare to prepare_database (diff) | |
| download | synapse-7ec9be9c53bb7f5f8b2ef07cf499c232c6137b39.tar.xz | |
Merge pull request #300 from matrix-org/erikj/store_engine
Split out the schema preparation and update logic into its own module
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..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 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 d18e2808d1..bad3b5c5ac 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.prepare_database import ( + prepare_database, prepare_sqlite3_database +) class Sqlite3Engine(object): |