Support Django 4.2 + psycopg3 (#208)

Author: snuderl

.circleci/config.yml

@@ -7,7 +7,7 @@ executors:
         type: string
     docker:
       - image: python:<< parameters.version >>-buster
-      - image: postgres:11.0
+      - image: postgres:12.0
         environment:
           POSTGRES_DB: 'psqlextra'
           POSTGRES_USER: 'psqlextra'
@@ -42,7 +42,6 @@ commands:
           environment:
             DATABASE_URL: 'postgres://psqlextra:psqlextra@localhost:5432/psqlextra'
 
-
 jobs:
   test-python36:
     executor:
@@ -78,7 +77,7 @@ jobs:
           extra: test
       - run-tests:
           pyversion: 38
-          djversions: 20,21,22,30,31,32,40
+          djversions: 20,21,22,30,31,32,40,41,42
 
   test-python39:
     executor:
@@ -90,7 +89,7 @@ jobs:
           extra: test
       - run-tests:
           pyversion: 39
-          djversions: 21,22,30,31,32,40
+          djversions: 21,22,30,31,32,40,41,42
 
   test-python310:
     executor:
@@ -102,7 +101,7 @@ jobs:
           extra: test
       - run-tests:
           pyversion: 310
-          djversions: 21,22,30,31,32,40
+          djversions: 21,22,30,31,32,40,41,42
       - store_test_results:
           path: reports
       - run:

psqlextra/backend/schema.py

@@ -430,7 +430,9 @@ def _create_view_model(self, sql: str, model: Model) -> None:
         meta = self._view_properties_for_model(model)
 
         with self.connection.cursor() as cursor:
-            view_sql = cursor.mogrify(*meta.query).decode("utf-8")
+            view_sql = cursor.mogrify(*meta.query)
+            if isinstance(view_sql, bytes):
+                view_sql = view_sql.decode("utf-8")
 
         self.execute(sql % (self.quote_name(model._meta.db_table), view_sql))
 

psqlextra/compiler.py

@@ -187,12 +187,13 @@ def execute_sql(self, return_id=False):
                     rows.extend(cursor.fetchall())
                 except ProgrammingError:
                     pass
+            description = cursor.description
 
         # create a mapping between column names and column value
         return [
             {
                 column.name: row[column_index]
-                for column_index, column in enumerate(cursor.description)
+                for column_index, column in enumerate(description)
                 if row
             }
             for row in rows

setup.py

@@ -95,6 +95,10 @@ def run(self):
             "build==0.7.0",
             "twine==3.7.1",
         ],
+        "psycopg3": [
+            "django>=4.2,<5.0",
+            "psycopg[binary]>=3.0.0",
+        ],
     },
     cmdclass={
         "lint": create_command(

tests/conftest.py

@@ -29,7 +29,7 @@ def fake_app():
 def postgres_server_version(db) -> int:
     """Gets the PostgreSQL server version."""
 
-    return connection.cursor().connection.server_version
+    return connection.cursor().connection.info.server_version
 
 
 @pytest.fixture(autouse=True)

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py36-dj{20,21,22,30,31,32}, py37-dj{20,21,22,30,31,32}, py38-dj{20,21,22,30,31,32,40, 41}, py39-dj{21,22,30,31,32,40,41}, py310-dj{21,22,30,31,32,40,41}
+envlist = py36-dj{20,21,22,30,31,32}, py37-dj{20,21,22,30,31,32}, py38-dj{20,21,22,30,31,32,40,41,42}, py39-dj{21,22,30,31,32,40,41,42}, py310-dj{21,22,30,31,32,40,41,42}
 
 [testenv]
 deps =
@@ -11,6 +11,7 @@ deps =
     dj32: Django~=3.2.0
     dj40: Django~=4.0.0
     dj41: Django~=4.1.0
+    dj42: .[psycopg3]
     .[test]
 setenv =
     DJANGO_SETTINGS_MODULE=settings