diff options
author | Erik Johnston <erik@matrix.org> | 2016-04-06 14:08:18 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-04-06 14:15:45 +0100 |
commit | 8aab9d87fa6739345810f0edf3982fe7f898ee30 (patch) | |
tree | 8ef3d62989c3014732b8efcaafddfc9c43c36b77 /synapse/storage/engines/postgres.py | |
parent | Merge pull request #692 from matrix-org/markjh/replicate_reshuffle (diff) | |
download | synapse-8aab9d87fa6739345810f0edf3982fe7f898ee30.tar.xz |
Don't require config to create database
Diffstat (limited to 'synapse/storage/engines/postgres.py')
-rw-r--r-- | synapse/storage/engines/postgres.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py index a09685b4df..c2290943b4 100644 --- a/synapse/storage/engines/postgres.py +++ b/synapse/storage/engines/postgres.py @@ -13,18 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -from synapse.storage.prepare_database import prepare_database - from ._base import IncorrectDatabaseSetup class PostgresEngine(object): single_threaded = False - def __init__(self, database_module, config): + def __init__(self, database_module): self.module = database_module self.module.extensions.register_type(self.module.extensions.UNICODE) - self.config = config def check_database(self, txn): txn.execute("SHOW SERVER_ENCODING") @@ -44,9 +41,6 @@ class PostgresEngine(object): self.module.extensions.ISOLATION_LEVEL_REPEATABLE_READ ) - def prepare_database(self, db_conn): - prepare_database(db_conn, self, config=self.config) - def is_deadlock(self, error): if isinstance(error, self.module.DatabaseError): return error.pgcode in ["40001", "40P01"] |