From 882c433233afe3a298f27ff9e1777943defa6c9a Mon Sep 17 00:00:00 2001
From: Thad Fleming <thadeus.fleming@cognitivespace.com>
Date: Thu, 1 Feb 2024 15:43:02 +0000
Subject: [PATCH 1/2] Remove conditional around SmallAutoField
This was introduced in Django 3.0 and the project requires Django >= 3.2
---
graphene_django/converter.py | 8 +-------
graphene_django/tests/test_converter.py | 3 +--
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/graphene_django/converter.py b/graphene_django/converter.py
index 121c1de10..ef6d640e7 100644
--- a/graphene_django/converter.py
+++ b/graphene_django/converter.py
@@ -183,19 +183,13 @@ def convert_field_to_string(field, registry=None):
)
+@convert_django_field.register(models.SmallAutoField)
@convert_django_field.register(models.BigAutoField)
@convert_django_field.register(models.AutoField)
def convert_field_to_id(field, registry=None):
return ID(description=get_django_field_description(field), required=not field.null)
-if hasattr(models, "SmallAutoField"):
-
- @convert_django_field.register(models.SmallAutoField)
- def convert_field_small_to_id(field, registry=None):
- return convert_field_to_id(field, registry)
-
-
@convert_django_field.register(models.UUIDField)
def convert_field_to_uuid(field, registry=None):
return UUID(
diff --git a/graphene_django/tests/test_converter.py b/graphene_django/tests/test_converter.py
index e8c09208c..69913aefc 100644
--- a/graphene_django/tests/test_converter.py
+++ b/graphene_django/tests/test_converter.py
@@ -115,8 +115,7 @@ def test_should_big_auto_convert_id():
def test_should_small_auto_convert_id():
- if hasattr(models, "SmallAutoField"):
- assert_conversion(models.SmallAutoField, graphene.ID, primary_key=True)
+ assert_conversion(models.SmallAutoField, graphene.ID, primary_key=True)
def test_should_uuid_convert_id():
From 840b6990165e34b22d4c95f57fed4a7d359a9ab1 Mon Sep 17 00:00:00 2001
From: Thad Fleming <thadeus.fleming@cognitivespace.com>
Date: Thu, 1 Feb 2024 15:55:22 +0000
Subject: [PATCH 2/2] Associate {Big,Small}AutoField with GlobalIDFilter
---
graphene_django/filter/filterset.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/graphene_django/filter/filterset.py b/graphene_django/filter/filterset.py
index 7e0d0c520..78af9cf24 100644
--- a/graphene_django/filter/filterset.py
+++ b/graphene_django/filter/filterset.py
@@ -11,6 +11,8 @@
GRAPHENE_FILTER_SET_OVERRIDES = {
models.AutoField: {"filter_class": GlobalIDFilter},
+ models.BigAutoField: {"filter_class": GlobalIDFilter},
+ models.SmallAutoField: {"filter_class": GlobalIDFilter},
models.OneToOneField: {"filter_class": GlobalIDFilter},
models.ForeignKey: {"filter_class": GlobalIDFilter},
models.ManyToManyField: {"filter_class": GlobalIDMultipleChoiceFilter},