summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2023-11-09 15:01:30 -0500
committerPatrick Cloke <patrickc@matrix.org>2023-11-09 15:01:30 -0500
commitf118aa688910e45ac0d1cc8bb4f225afadb2b4aa (patch)
tree15c61915d66019e04959cf375ca6ea169e25b2c9
parentSupport running tests in CI. (diff)
downloadsynapse-clokep/psycopg3.tar.xz
-rw-r--r--synapse/storage/database.py2
-rw-r--r--synapse/storage/databases/main/event_federation.py2
-rw-r--r--synapse/storage/databases/main/relations.py2
3 files changed, 2 insertions, 4 deletions
diff --git a/synapse/storage/database.py b/synapse/storage/database.py
index 92b3c77b6d..da6473ea28 100644
--- a/synapse/storage/database.py
+++ b/synapse/storage/database.py
@@ -59,10 +59,10 @@ from synapse.metrics.background_process_metrics import run_as_background_process
 from synapse.storage.background_updates import BackgroundUpdater
 from synapse.storage.engines import (
     BaseDatabaseEngine,
+    PostgresEngine,
     Psycopg2Engine,
     PsycopgEngine,
     Sqlite3Engine,
-    PostgresEngine,
 )
 from synapse.storage.types import Connection, Cursor, SQLQueryParameters
 from synapse.util.async_helpers import delay_cancellation
diff --git a/synapse/storage/databases/main/event_federation.py b/synapse/storage/databases/main/event_federation.py
index 98556a0523..b5d00348a6 100644
--- a/synapse/storage/databases/main/event_federation.py
+++ b/synapse/storage/databases/main/event_federation.py
@@ -47,7 +47,7 @@ from synapse.storage.database import (
 )
 from synapse.storage.databases.main.events_worker import EventsWorkerStore
 from synapse.storage.databases.main.signatures import SignatureWorkerStore
-from synapse.storage.engines import PostgresEngine, Psycopg2Engine, Sqlite3Engine
+from synapse.storage.engines import PostgresEngine, Sqlite3Engine
 from synapse.types import JsonDict, StrCollection
 from synapse.util import json_encoder
 from synapse.util.caches.descriptors import cached
diff --git a/synapse/storage/databases/main/relations.py b/synapse/storage/databases/main/relations.py
index d0bc78b2e3..cf3ea28a3a 100644
--- a/synapse/storage/databases/main/relations.py
+++ b/synapse/storage/databases/main/relations.py
@@ -47,8 +47,6 @@ from synapse.storage.databases.main.stream import (
     generate_pagination_where_clause,
 )
 from synapse.storage.engines import PostgresEngine, Psycopg2Engine
-from synapse.types import JsonDict, StreamKeyType, StreamToken
-from synapse.storage.engines import PostgresEngine
 from synapse.types import JsonDict, MultiWriterStreamToken, StreamKeyType, StreamToken
 from synapse.util.caches.descriptors import cached, cachedList