From e7f7d8da07ba1020f9916153f17e97b0ec037712 Mon Sep 17 00:00:00 2001 From: Paul Bailey Date: Fri, 11 Jun 2021 15:41:02 -0500 Subject: [PATCH 1/4] Add missing auto fields (#1212) * add missing auto fields * add missing auto fields * skip small auto field sometimes * make small auto optional * make small auto optional --- graphene_django/converter.py | 8 ++++++++ graphene_django/tests/test_converter.py | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/graphene_django/converter.py b/graphene_django/converter.py index da96161..c243e82 100644 --- a/graphene_django/converter.py +++ b/graphene_django/converter.py @@ -166,11 +166,19 @@ def convert_field_to_string(field, registry=None): ) +@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 fe84e73..afd744f 100644 --- a/graphene_django/tests/test_converter.py +++ b/graphene_django/tests/test_converter.py @@ -111,6 +111,15 @@ def test_should_auto_convert_id(): assert_conversion(models.AutoField, graphene.ID, primary_key=True) +def test_should_big_auto_convert_id(): + assert_conversion(models.BigAutoField, graphene.ID, primary_key=True) + + +def test_should_small_auto_convert_id(): + if hasattr(models, "SmallAutoField"): + assert_conversion(models.SmallAutoField, graphene.ID, primary_key=True) + + def test_should_uuid_convert_id(): assert_conversion(models.UUIDField, graphene.UUID) From 1e4b03b9756baebbfcf7e9e3a25932a4e613570b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 12:49:16 +0300 Subject: [PATCH 2/4] Bump django from 3.1.8 to 3.1.14 in /examples/cookbook-plain (#1282) Bumps [django](https://github.com/django/django) from 3.1.8 to 3.1.14. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/3.1.8...3.1.14) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/cookbook-plain/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/cookbook-plain/requirements.txt b/examples/cookbook-plain/requirements.txt index 9fc1a3a..85a8963 100644 --- a/examples/cookbook-plain/requirements.txt +++ b/examples/cookbook-plain/requirements.txt @@ -1,4 +1,4 @@ graphene>=2.1,<3 graphene-django>=2.1,<3 graphql-core>=2.1,<3 -django==3.1.8 +django==3.1.14 From ef9d67302ef85f1a5d3047a44cf65a2173c3ca2e Mon Sep 17 00:00:00 2001 From: Chouaib Lammas <54365321+chlammas@users.noreply.github.com> Date: Fri, 10 Dec 2021 09:51:10 +0000 Subject: [PATCH 3/4] Fix ingredient model (#1258) Add the required positional argument: 'on_delete' --- docs/tutorial-relay.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial-relay.rst b/docs/tutorial-relay.rst index acc4b0d..3de9022 100644 --- a/docs/tutorial-relay.rst +++ b/docs/tutorial-relay.rst @@ -70,7 +70,7 @@ Let's get started with these models: class Ingredient(models.Model): name = models.CharField(max_length=100) notes = models.TextField() - category = models.ForeignKey(Category, related_name='ingredients') + category = models.ForeignKey(Category, related_name='ingredients', on_delete=models.CASCADE) def __str__(self): return self.name From 32667b5407a81ec58a0c22936f9ef234be47e20c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 12:58:03 +0300 Subject: [PATCH 4/4] Bump django from 3.1.8 to 3.1.14 in /examples/cookbook (#1283) Bumps [django](https://github.com/django/django) from 3.1.8 to 3.1.14. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/3.1.8...3.1.14) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/cookbook/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/cookbook/requirements.txt b/examples/cookbook/requirements.txt index f6d03ff..a5b0b96 100644 --- a/examples/cookbook/requirements.txt +++ b/examples/cookbook/requirements.txt @@ -1,5 +1,5 @@ graphene>=2.1,<3 graphene-django>=2.1,<3 graphql-core>=2.1,<3 -django==3.1.8 +django==3.1.14 django-filter>=2