graphql-python/graphene-django
1
1
Fork 0
mirror of https://github.com/graphql-python/graphene-django.git synced 2025-02-18 12:30:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #66 from pizzapanther/master

Browse Source 
added timefield support
This commit is contained in:
Syrus Akbary 2016-12-01 21:41:24 -08:00 committed by GitHub
commit 401af42a55
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
graphene_django/converter.py
View File

@ -4,7 +4,7 @@ from django.utils.encoding import force_text
from graphene import (ID, Boolean, Dynamic, Enum, Field, Float, Int, List, from graphene import (ID, Boolean, Dynamic, Enum, Field, Float, Int, List,
NonNull, String) NonNull, String)
from graphene.relay import is_node from graphene.relay import is_node
from graphene.types.datetime import DateTime from graphene.types.datetime import DateTime, Time
from graphene.types.json import JSONString from graphene.types.json import JSONString
from graphene.utils.str_converters import to_camel_case, to_const from graphene.utils.str_converters import to_camel_case, to_const
from graphql import assert_valid_name from graphql import assert_valid_name
@ -112,6 +112,11 @@ def convert_date_to_string(field, registry=None):
return DateTime(description=field.help_text, required=not field.null) return DateTime(description=field.help_text, required=not field.null)
@convert_django_field.register(models.TimeField)
def convert_time_to_string(field, registry=None):
return Time(description=field.help_text, required=not field.null)
@convert_django_field.register(models.OneToOneRel) @convert_django_field.register(models.OneToOneRel)
def convert_onetoone_field_to_djangomodel(field, registry=None): def convert_onetoone_field_to_djangomodel(field, registry=None):
model = get_related_model(field) model = get_related_model(field)

8
graphene_django/tests/test_converter.py
View File

@ -5,7 +5,7 @@ from py.test import raises
import graphene import graphene
from graphene.relay import ConnectionField, Node from graphene.relay import ConnectionField, Node
from graphene.types.datetime import DateTime from graphene.types.datetime import DateTime, Time
from graphene.types.json import JSONString from graphene.types.json import JSONString
from ..compat import (ArrayField, HStoreField, JSONField, MissingType, from ..compat import (ArrayField, HStoreField, JSONField, MissingType,
@ -16,7 +16,7 @@ from ..types import DjangoObjectType
from .models import Article, Film, FilmDetails, Reporter from .models import Article, Film, FilmDetails, Reporter
# from graphene.core.types.custom_scalars import DateTime, JSONString # from graphene.core.types.custom_scalars import DateTime, Time, JSONString
def assert_conversion(django_field, graphene_field, *args, **kwargs): def assert_conversion(django_field, graphene_field, *args, **kwargs):
@ -44,6 +44,10 @@ def test_should_date_convert_string():
assert_conversion(models.DateField, DateTime) assert_conversion(models.DateField, DateTime)
def test_should_time_convert_string():
assert_conversion(models.TimeField, Time)
def test_should_char_convert_string(): def test_should_char_convert_string():
assert_conversion(models.CharField, graphene.String) assert_conversion(models.CharField, graphene.String)

2
setup.py
View File

@ -33,7 +33,7 @@ setup(
install_requires=[ install_requires=[
'six>=1.10.0', 'six>=1.10.0',
'graphene>=1.0', 'graphene>=1.1.2',
'Django>=1.6.0', 'Django>=1.6.0',
'iso8601', 'iso8601',
'singledispatch>=3.4.0.3', 'singledispatch>=3.4.0.3',