feat: Nested optimization for lists and connections

.github/workflows/tests.yml

@@ -43,9 +43,6 @@ jobs:
       fail-fast: false
       matrix:
         django-version:
-          - 3.2.*
-          - 4.0.*
-          - 4.1.*
           - 4.2.*
           - 5.0.*
         python-version:

.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
       - id: check-xml
       - id: check-symlinks
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.5
+    rev: v0.4.7
     hooks:
       - id: ruff-format
       - id: ruff

pyproject.toml

@@ -26,9 +26,6 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Framework :: Django",
-  "Framework :: Django :: 3.2",
-  "Framework :: Django :: 4.0",
-  "Framework :: Django :: 4.1",
   "Framework :: Django :: 4.2",
   "Framework :: Django :: 5.0",
 ]
@@ -39,7 +36,7 @@ django = ">=3.2"
 asgiref = ">=3.8"
 django-choices-field = { version = ">=2.2.2", optional = true }
 django-debug-toolbar = { version = ">=3.4", optional = true }
-strawberry-graphql = ">=0.227.1"
+strawberry-graphql = ">=0.234.0"
 
 [tool.poetry.group.dev.dependencies]
 Markdown = "^3.3.7"

strawberry_django/fields/field.py

@@ -36,7 +36,7 @@
 from strawberry_django.descriptors import ModelProperty
 from strawberry_django.fields.base import StrawberryDjangoFieldBase
 from strawberry_django.filters import FILTERS_ARG, StrawberryDjangoFieldFilters
-from strawberry_django.optimizer import OptimizerStore
+from strawberry_django.optimizer import OptimizerStore, is_optimized_by_prefetching
 from strawberry_django.ordering import ORDER_ARG, StrawberryDjangoFieldOrdering
 from strawberry_django.pagination import StrawberryDjangoPagination
 from strawberry_django.permissions import filter_with_perms
@@ -46,6 +46,7 @@
     default_qs_hook,
     django_getattr,
     django_resolver,
+    resolve_base_manager,
 )
 
 if TYPE_CHECKING:
@@ -222,7 +223,7 @@ async def async_resolver():
                 resolved = await result  # type: ignore
 
                 if isinstance(resolved, BaseManager):
-                    resolved = resolved.all()
+                    resolved = resolve_base_manager(resolved)
 
                 if isinstance(resolved, models.QuerySet):
                     if "info" not in kwargs:
@@ -237,7 +238,7 @@ async def async_resolver():
             return async_resolver()
 
         if isinstance(result, BaseManager):
-            result = result.all()
+            result = resolve_base_manager(result)
 
         if isinstance(result, models.QuerySet):
             if "info" not in kwargs:
@@ -279,6 +280,11 @@ def qs_hook(qs: models.QuerySet):
         return qs_hook
 
     def get_queryset(self, queryset, info, **kwargs):
+        # If the queryset been optimized at prefetch phase, this function has already been
+        # called by the optimizer extension, meaning we don't want to call it again
+        if is_optimized_by_prefetching(queryset):
+            return queryset
+
         queryset = run_type_get_queryset(queryset, self.django_type, info)
         queryset = super().get_queryset(
             filter_with_perms(queryset, info), info, **kwargs

strawberry_django/fields/types.py

@@ -18,7 +18,6 @@
     Union,
 )
 
-import django
 import strawberry
 from django.core.exceptions import FieldDoesNotExist, ImproperlyConfigured
 from django.db.models import Field, Model, fields
@@ -239,13 +238,15 @@ def __hash__(self):
     fields.IntegerField: int,
     fields.PositiveIntegerField: int,
     fields.PositiveSmallIntegerField: int,
+    fields.PositiveBigIntegerField: int,
     fields.SlugField: str,
     fields.SmallAutoField: strawberry.ID,
     fields.SmallIntegerField: int,
     fields.TextField: str,
     fields.TimeField: datetime.time,
     fields.URLField: str,
     fields.UUIDField: uuid.UUID,
+    json.JSONField: JSON,
     files.FileField: DjangoFileType,
     files.ImageField: DjangoImageType,
     related.ForeignKey: DjangoModelType,
@@ -256,18 +257,6 @@ def __hash__(self):
     reverse_related.OneToOneRel: DjangoModelType,
 }
 
-if hasattr(fields, "NullBooleanField"):
-    # NullBooleanField was deprecated and will soon be removed
-    field_type_map[fields.NullBooleanField] = Optional[bool]  # type: ignore
-
-if django.VERSION >= (3, 1):
-    field_type_map.update(
-        {
-            json.JSONField: JSON,
-            fields.PositiveBigIntegerField: int,
-        },
-    )
-
 try:
     from django.contrib.gis import geos
     from django.contrib.gis.db import models as geos_fields