summary refs log tree commit diff
path: root/synapse/storage/engines/postgres.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2016-02-11 14:10:00 +0000
committerDaniel Wagner-Hall <daniel@matrix.org>2016-02-11 17:26:42 +0000
commit763360594dfb90433f693056d3d64ac82409fc87 (patch)
tree1cfd7afde7a81909134349c09ba1cbc51c145990 /synapse/storage/engines/postgres.py
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-763360594dfb90433f693056d3d64ac82409fc87.tar.xz
Mark AS users with their AS's ID
Diffstat (limited to 'synapse/storage/engines/postgres.py')
-rw-r--r--synapse/storage/engines/postgres.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py

index 17b7a9c077..a09685b4df 100644 --- a/synapse/storage/engines/postgres.py +++ b/synapse/storage/engines/postgres.py
@@ -21,9 +21,10 @@ from ._base import IncorrectDatabaseSetup class PostgresEngine(object): single_threaded = False - def __init__(self, database_module): + def __init__(self, database_module, config): 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,7 +45,7 @@ class PostgresEngine(object): ) def prepare_database(self, db_conn): - prepare_database(db_conn, self) + prepare_database(db_conn, self, config=self.config) def is_deadlock(self, error): if isinstance(error, self.module.DatabaseError):