diff options
| author | David Baker <dave@matrix.org> | 2016-04-07 16:35:22 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-04-07 16:35:22 +0100 |
| commit | 9c99ab4572623a8a9554e6c0292f34059252c6b7 (patch) | |
| tree | 3b231aab16688d64bc6e30561ddd42949c2ab727 /synapse/storage/engines/postgres.py | |
| parent | Remove code that's now been obsoleted or moved elsewhere (diff) | |
| parent | Merge pull request #703 from matrix-org/erikj/member (diff) | |
| download | synapse-9c99ab4572623a8a9554e6c0292f34059252c6b7.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/pushers_use_event_actions
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"] |