synapse.storage.engines: use psycopg2cffi compat hook

Plainly importing psycopg2cffi as psycopg2 is inadequate, because psycopg2 or its components (psycopg2.extras) are being also imported elsewhere and patching them all is prone to breakage. Fixes matrix-org#5054. Signed-off-by: Ivan Shapovalov <[email protected]>
intelfx · Jan 30, 2021 · ca39247 · ca39247
1 parent f2c1560
commit ca39247
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/changelog.d/9270.misc b/changelog.d/9270.misc
@@ -0,0 +1 @@
+Restore PyPy compatibility by using psycopg2cffi consistently.
diff --git a/synapse/storage/engines/__init__.py b/synapse/storage/engines/__init__.py
@@ -30,9 +30,11 @@ def create_engine(database_config) -> BaseDatabaseEngine:
     if name == "psycopg2":
         # pypy requires psycopg2cffi rather than psycopg2
         if platform.python_implementation() == "PyPy":
-            import psycopg2cffi as psycopg2  # type: ignore
-        else:
-            import psycopg2  # type: ignore
+            from psycopg2cffi import compat  # type: ignore
+
+            compat.register()
+
+        import psycopg2  # type: ignore
 
         return PostgresEngine(psycopg2, database_config)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Restore PyPy compatibility by using psycopg2cffi consistently.