Add support for Django 5.2 and bump version to 0.0.13 (#14)

* Add support for Django 5.2 and bump version to 0.0.13

Co-Authored-By: Nishant Singh <[email protected]>

* changes

* fix

* fix

* use postgres 14

* fix

* fix

---------

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Nishant Singh <[email protected]>

Author: devin-ai-integration[bot]

.github/workflows/test.yml

@@ -14,19 +14,25 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
+        psycopg-package: ["psycopg2", "psycopg"]
         python-version: ["3.9", "3.10", "3.11"]
-        django-version: ["4.0", "4.1", "4.2", "5.0", "5.1"]
+        django-version: ["4.0", "4.1", "4.2", "5.0", "5.1", "5.2"]
         exclude:
-          # Django 5.0+ requires Python 3.10+
           - python-version: "3.9"
             django-version: "5.0"
           - python-version: "3.9"
             django-version: "5.1"
-      max-parallel: 5
+          - python-version: "3.9"
+            django-version: "5.2"
+          - django-version: "4.0"
+            psycopg-package: "psycopg"
+          - django-version: "4.1"
+            psycopg-package: "psycopg"
+      max-parallel: 20
 
     services:
       postgres:
-        image: postgres:13
+        image: postgres:14
         env:
           POSTGRES_PASSWORD: postgres
         options: >-
@@ -50,7 +56,8 @@ jobs:
           # Install main dependencies, dev dependencies, and the specific Django version for the matrix
           # Using -e .[dev] installs the current package in editable mode with dev extras
           uv pip install --system -e .[dev]
-          uv pip install --system Django==${{ matrix.django-version }}
+          pip install Django==${{ matrix.django-version }}
+          pip install ${{ matrix.psycopg-package }}
       - name: Run tests
         run: |
           ./check-lint.sh

django_querysets_single_query_fetch/service.py

@@ -24,7 +24,6 @@
     get_related_populators,
 )
 from django.utils.dateparse import parse_datetime
-from psycopg2.extensions import QuotedString
 
 logger = logging.getLogger(__name__)
 
@@ -189,6 +188,19 @@ def _get_compiler_from_queryset(self, queryset: QuerysetWrapperType) -> Any:
 
         return compiler
 
+    def _get_sanitized_sql_param(self, param: str) -> str:
+        try:
+            from psycopg import sql
+
+            return sql.quote(param)
+        except ImportError:
+            try:
+                from psycopg2.extensions import QuotedString
+
+                return QuotedString(param).getquoted().decode("utf-8")
+            except ImportError:
+                raise ImportError("psycopg or psycopg2 not installed")
+
     def _get_django_sql_for_queryset(self, queryset: QuerysetWrapperType) -> str:
         """
         gets the sql that django would normally execute for the queryset, return empty string
@@ -212,7 +224,7 @@ def _get_django_sql_for_queryset(self, queryset: QuerysetWrapperType) -> str:
         for param in params:
             if isinstance(param, str):
                 # this is to handle special char handling
-                param = QuotedString(param).getquoted().decode("utf-8")
+                param = self._get_sanitized_sql_param(param)
             elif isinstance(param, UUID) or isinstance(param, datetime.datetime):
                 param = f"'{param}'"
             elif isinstance(param, int) or isinstance(param, float):
@@ -419,7 +431,7 @@ def execute(self) -> list[list[Any]]:
             raw_sql = f"""
                 SELECT
                     json_build_object(
-                        {', '.join([f"'{i}', {sql}" for i, sql in enumerate(non_empty_django_sqls_for_querysets)])}
+                        {", ".join([f"'{i}', {sql}" for i, sql in enumerate(non_empty_django_sqls_for_querysets)])}
                 )
             """
             with connections["default"].cursor() as cursor:

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "django-querysets-single-query-fetch"
-version = "0.0.12"
+version = "0.0.13"
 description = "Execute multiple Django querysets in a single SQL query"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -30,8 +30,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dependencies = [
-    "django>=4.0,<5.2", # From setup.py
-    "psycopg2==2.9.9" # Keep specific version for now
+    "django>=4.0,<5.3", # Updated to include Django 5.2
 ]
 
 [project.urls]

testproject/settings.py

@@ -78,11 +78,14 @@
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.postgresql",
-        "NAME": "testdb",
+        "NAME": "sqf-db",
         "USER": "postgres",
         "PASSWORD": "postgres",
         "HOST": os.environ.get("DEFAULT_DB_HOST") or "localhost",
         "PORT": "5432",
+        "TEST": {
+            "NAME": "sqf-db-test",
+        },
     }
 }