Skip to content

Commit 75a6db7

Browse files
dulmandakhsuperlevure
authored andcommitted
remove JSONField compat (graphql-python#1421)
* remove JSONFIeld compat * fix black
1 parent c874678 commit 75a6db7

File tree

4 files changed

+5
-28
lines changed

4 files changed

+5
-28
lines changed

graphene_django/compat.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,7 @@ def __init__(self, *args, **kwargs):
1010
IntegerRangeField,
1111
ArrayField,
1212
HStoreField,
13-
JSONField as PGJSONField,
1413
RangeField,
1514
)
1615
except ImportError:
17-
IntegerRangeField, ArrayField, HStoreField, PGJSONField, RangeField = (
18-
MissingType,
19-
) * 5
20-
21-
try:
22-
# JSONField is only available from Django 3.1
23-
from django.db.models import JSONField
24-
except ImportError:
25-
JSONField = MissingType
16+
IntegerRangeField, ArrayField, HStoreField, RangeField = (MissingType,) * 5

graphene_django/converter.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
from graphql import assert_valid_name as assert_name
3636
from graphql.pyutils import register_description
3737

38-
from .compat import ArrayField, HStoreField, JSONField, PGJSONField, RangeField
38+
from .compat import ArrayField, HStoreField, RangeField
3939
from .fields import DjangoListField, DjangoConnectionField
4040
from .settings import graphene_settings
4141
from .utils.str_converters import to_const
@@ -346,9 +346,8 @@ def convert_postgres_array_to_list(field, registry=None):
346346

347347

348348
@convert_django_field.register(HStoreField)
349-
@convert_django_field.register(PGJSONField)
350-
@convert_django_field.register(JSONField)
351-
def convert_pg_and_json_field_to_string(field, registry=None):
349+
@convert_django_field.register(models.JSONField)
350+
def convert_json_field_to_string(field, registry=None):
352351
return JSONString(
353352
description=get_django_field_description(field), required=not field.null
354353
)

graphene_django/tests/test_converter.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
from ..compat import (
1616
ArrayField,
1717
HStoreField,
18-
JSONField,
19-
PGJSONField,
2018
MissingType,
2119
RangeField,
2220
)
@@ -372,16 +370,6 @@ def test_should_postgres_hstore_convert_string():
372370
assert_conversion(HStoreField, JSONString)
373371

374372

375-
@pytest.mark.skipif(PGJSONField is MissingType, reason="PGJSONField should exist")
376-
def test_should_postgres_json_convert_string():
377-
assert_conversion(PGJSONField, JSONString)
378-
379-
380-
@pytest.mark.skipif(JSONField is MissingType, reason="JSONField should exist")
381-
def test_should_json_convert_string():
382-
assert_conversion(JSONField, JSONString)
383-
384-
385373
@pytest.mark.skipif(RangeField is MissingType, reason="RangeField should exist")
386374
def test_should_postgres_range_convert_list():
387375
from django.contrib.postgres.fields import IntegerRangeField

graphene_django/tests/test_query.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,12 @@ def test_should_query_postgres_fields():
119119
from django.contrib.postgres.fields import (
120120
IntegerRangeField,
121121
ArrayField,
122-
JSONField,
123122
HStoreField,
124123
)
125124

126125
class Event(models.Model):
127126
ages = IntegerRangeField(help_text="The age ranges")
128-
data = JSONField(help_text="Data")
127+
data = models.JSONField(help_text="Data")
129128
store = HStoreField()
130129
tags = ArrayField(models.CharField(max_length=50))
131130

0 commit comments

Comments
 (0)