Skip to content

Commit 76613a7

Browse files
author
Julien Nakache
committed
fix tests
1 parent dc7e2bb commit 76613a7

File tree

2 files changed

+23
-18
lines changed

2 files changed

+23
-18
lines changed

graphene_sqlalchemy/fields.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,16 @@ def __init__(self, type, *args, **kwargs):
9898
super(SQLAlchemyConnectionField, self).__init__(type, *args, **kwargs)
9999

100100

101+
def default_connection_field_factory(relationship, registry):
102+
log.warn(
103+
'This is deprecated and will be removed in the next '
104+
'major version. Use TODO instead.'
105+
)
106+
model = relationship.mapper.entity
107+
model_type = registry.get_type_for_model(model)
108+
return createConnectionField(model_type)
109+
110+
101111
# TODO Remove in next major version
102112
__connectionFactory = UnsortedSQLAlchemyConnectionField
103113

@@ -126,13 +136,3 @@ def unregisterConnectionFieldFactory():
126136
)
127137
global __connectionFactory
128138
__connectionFactory = UnsortedSQLAlchemyConnectionField
129-
130-
131-
def default_connection_field_factory(relationship, registry):
132-
log.warn(
133-
'This is deprecated and will be removed in the next '
134-
'major version. Use TODO instead.'
135-
)
136-
model = relationship.mapper.entity
137-
model_type = registry.get_type_for_model(model)
138-
return createConnectionField(model_type)

graphene_sqlalchemy/tests/test_converter.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
from ..converter import (convert_sqlalchemy_column,
1717
convert_sqlalchemy_composite,
1818
convert_sqlalchemy_relationship)
19-
from ..fields import UnsortedSQLAlchemyConnectionField
19+
from ..fields import (UnsortedSQLAlchemyConnectionField,
20+
default_connection_field_factory)
2021
from ..registry import Registry
2122
from ..types import SQLAlchemyObjectType
2223
from .models import Article, Pet, Reporter
@@ -179,7 +180,9 @@ def test_should_jsontype_convert_jsonstring():
179180

180181
def test_should_manytomany_convert_connectionorlist():
181182
registry = Registry()
182-
dynamic_field = convert_sqlalchemy_relationship(Reporter.pets.property, registry)
183+
dynamic_field = convert_sqlalchemy_relationship(
184+
Reporter.pets.property, registry, default_connection_field_factory
185+
)
183186
assert isinstance(dynamic_field, graphene.Dynamic)
184187
assert not dynamic_field.get_type()
185188

@@ -190,7 +193,7 @@ class Meta:
190193
model = Pet
191194

192195
dynamic_field = convert_sqlalchemy_relationship(
193-
Reporter.pets.property, A._meta.registry
196+
Reporter.pets.property, A._meta.registry, test_should_manytomany_convert_connectionorlist
194197
)
195198
assert isinstance(dynamic_field, graphene.Dynamic)
196199
graphene_type = dynamic_field.get_type()
@@ -206,15 +209,17 @@ class Meta:
206209
interfaces = (Node,)
207210

208211
dynamic_field = convert_sqlalchemy_relationship(
209-
Reporter.pets.property, A._meta.registry
212+
Reporter.pets.property, A._meta.registry, default_connection_field_factory
210213
)
211214
assert isinstance(dynamic_field, graphene.Dynamic)
212215
assert isinstance(dynamic_field.get_type(), UnsortedSQLAlchemyConnectionField)
213216

214217

215218
def test_should_manytoone_convert_connectionorlist():
216219
registry = Registry()
217-
dynamic_field = convert_sqlalchemy_relationship(Article.reporter.property, registry)
220+
dynamic_field = convert_sqlalchemy_relationship(
221+
Article.reporter.property, registry, default_connection_field_factory
222+
)
218223
assert isinstance(dynamic_field, graphene.Dynamic)
219224
assert not dynamic_field.get_type()
220225

@@ -225,7 +230,7 @@ class Meta:
225230
model = Reporter
226231

227232
dynamic_field = convert_sqlalchemy_relationship(
228-
Article.reporter.property, A._meta.registry
233+
Article.reporter.property, A._meta.registry, default_connection_field_factory
229234
)
230235
assert isinstance(dynamic_field, graphene.Dynamic)
231236
graphene_type = dynamic_field.get_type()
@@ -240,7 +245,7 @@ class Meta:
240245
interfaces = (Node,)
241246

242247
dynamic_field = convert_sqlalchemy_relationship(
243-
Article.reporter.property, A._meta.registry
248+
Article.reporter.property, A._meta.registry, default_connection_field_factory
244249
)
245250
assert isinstance(dynamic_field, graphene.Dynamic)
246251
graphene_type = dynamic_field.get_type()
@@ -255,7 +260,7 @@ class Meta:
255260
interfaces = (Node,)
256261

257262
dynamic_field = convert_sqlalchemy_relationship(
258-
Reporter.favorite_article.property, A._meta.registry
263+
Reporter.favorite_article.property, A._meta.registry, default_connection_field_factory
259264
)
260265
assert isinstance(dynamic_field, graphene.Dynamic)
261266
graphene_type = dynamic_field.get_type()

0 commit comments

Comments
 (0)