Skip to content

Commit 41309d0

Browse files
committed
Adapted code to the new resovlers api
1 parent fb6fb69 commit 41309d0

File tree

4 files changed

+16
-19
lines changed

4 files changed

+16
-19
lines changed

graphene_sqlalchemy/fields.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
from sqlalchemy.orm.query import Query
44

5-
from graphene import final_resolver
65
from graphene.relay import ConnectionField
76
from graphene.relay.connection import PageInfo
87
from graphql_relay.connection.arrayconnection import connection_from_list_slice
@@ -17,8 +16,8 @@ def model(self):
1716
return self.type._meta.node._meta.model
1817

1918
@classmethod
20-
def get_query(cls, model, context, info, args):
21-
return get_query(model, context)
19+
def get_query(cls, model, info, **args):
20+
return get_query(model, info.context)
2221

2322
@property
2423
def type(self):
@@ -31,10 +30,10 @@ def type(self):
3130
return _type._meta.connection
3231

3332
@classmethod
34-
def connection_resolver(cls, resolver, connection, model, root, args, context, info):
35-
iterable = resolver(root, args, context, info)
33+
def connection_resolver(cls, resolver, connection, model, root, info, **args):
34+
iterable = resolver(root, info, **args)
3635
if iterable is None:
37-
iterable = cls.get_query(model, context, info, args)
36+
iterable = cls.get_query(model, info, **args)
3837
if isinstance(iterable, Query):
3938
_len = iterable.count()
4039
else:
@@ -54,7 +53,7 @@ def connection_resolver(cls, resolver, connection, model, root, args, context, i
5453
return connection
5554

5655
def get_resolver(self, parent_resolver):
57-
return final_resolver(partial(self.connection_resolver, parent_resolver, self.type, self.model))
56+
return partial(self.connection_resolver, parent_resolver, self.type, self.model)
5857

5958

6059
__connectionFactory = SQLAlchemyConnectionField

graphene_sqlalchemy/tests/test_query.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ class Arguments:
277277
ok = graphene.Boolean()
278278
article = graphene.Field(ArticleNode)
279279

280-
def mutate(self, headline, reporter_id):
280+
def mutate(self, info, headline, reporter_id):
281281
new_article = Article(
282282
headline=headline,
283283
reporter_id=reporter_id,

graphene_sqlalchemy/tests/test_utils.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from graphene import ObjectType, Schema, String, annotate, Context
1+
from graphene import ObjectType, Schema, String
22

33
from ..utils import get_session
44

@@ -9,9 +9,8 @@ def test_get_session():
99
class Query(ObjectType):
1010
x = String()
1111

12-
@annotate(context=Context)
13-
def resolve_x(self, context):
14-
return get_session(context)
12+
def resolve_x(self, info):
13+
return get_session(info.context)
1514

1615
query = '''
1716
query ReporterQuery {

graphene_sqlalchemy/types.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def __init_subclass_with_meta__(cls, model=None, registry=None, skip_registry=Fa
134134
registry.register(cls)
135135

136136
@classmethod
137-
def is_type_of(cls, root, context, info):
137+
def is_type_of(cls, root, info):
138138
if isinstance(root, cls):
139139
return True
140140
if not is_mapped_instance(root):
@@ -144,19 +144,18 @@ def is_type_of(cls, root, context, info):
144144
return isinstance(root, cls._meta.model)
145145

146146
@classmethod
147-
def get_query(cls, context):
147+
def get_query(cls, info):
148148
model = cls._meta.model
149-
return get_query(model, context)
149+
return get_query(model, info.context)
150150

151151
@classmethod
152-
def get_node(cls, id, context, info):
152+
def get_node(cls, info, id):
153153
try:
154-
return cls.get_query(context).get(id)
154+
return cls.get_query(info).get(id)
155155
except NoResultFound:
156156
return None
157157

158-
# @annotate(info=ResolveInfo)
159-
def resolve_id(self):
158+
def resolve_id(self, info):
160159
# graphene_type = info.parent_type.graphene_type
161160
keys = self.__mapper__.primary_key_from_instance(self)
162161
return tuple(keys) if len(keys) > 1 else keys[0]

0 commit comments

Comments
 (0)