Add support with v2

Author: CaselIT

graphene_sqlalchemy/fields.py

@@ -2,7 +2,7 @@
 from promise import is_thenable, Promise
 from sqlalchemy.orm.query import Query
 
-from graphene.relay import ConnectionField
+from graphene.relay import Connection, ConnectionField
 from graphene.relay.connection import PageInfo
 from graphql_relay.connection.arrayconnection import connection_from_list_slice
 
@@ -64,9 +64,17 @@ def get_resolver(self, parent_resolver):
 class SQLAlchemyConnectionField(UnsortedSQLAlchemyConnectionField):
 
     def __init__(self, type, *args, **kwargs):
-        if 'sort' not in kwargs:
-            kwargs.setdefault('sort', sort_argument_for_model(type._meta.model))
-        elif kwargs['sort'] is None:
+        if 'sort' not in kwargs and issubclass(type, Connection):
+            # Let super class raise if type is not a Connection
+            try:
+                model = type.Edge.node._type._meta.model
+                kwargs.setdefault('sort', sort_argument_for_model(model))
+            except Exception as e:
+                raise Exception(
+                    'Cannot create sort argument for {}. A model is required. Set the "sort" argument'
+                    ' to None to disabling the creation of the sort query argument'.format(type.__name__)
+                )
+        elif 'sort' in kwargs and kwargs['sort'] is None:
             del kwargs['sort']
         super(SQLAlchemyConnectionField, self).__init__(type, *args, **kwargs)
 

graphene_sqlalchemy/tests/test_fields.py

@@ -1,3 +1,6 @@
+from graphene.relay import Connection
+import pytest
+
 from ..fields import SQLAlchemyConnectionField
 from ..types import SQLAlchemyObjectType
 from ..utils import sort_argument_for_model
@@ -9,17 +12,27 @@ class Meta:
         model = PetModel
 
 
+class PetConn(Connection):
+    class Meta:
+        node = Pet
+
+
 def test_sort_added_by_default():
-    arg = SQLAlchemyConnectionField(Pet)
+    arg = SQLAlchemyConnectionField(PetConn)
     assert 'sort' in arg.args
     assert arg.args['sort'] == sort_argument_for_model(PetModel)
 
 
 def test_sort_can_be_removed():
-    arg = SQLAlchemyConnectionField(Pet, sort=None)
+    arg = SQLAlchemyConnectionField(PetConn, sort=None)
     assert 'sort' not in arg.args
 
 
 def test_custom_sort():
-    arg = SQLAlchemyConnectionField(Pet, sort=sort_argument_for_model(Editor))
-    assert arg.args['sort'] == sort_argument_for_model(Editor)
+    arg = SQLAlchemyConnectionField(PetConn, sort=sort_argument_for_model(Editor))
+    assert arg.args['sort'] == sort_argument_for_model(Editor)
+
+
+def test_init_raises():
+    with pytest.raises(Exception, match='Cannot create sort'):
+        SQLAlchemyConnectionField(Connection)

graphene_sqlalchemy/tests/test_query.py

@@ -3,7 +3,7 @@
 from sqlalchemy.orm import scoped_session, sessionmaker
 
 import graphene
-from graphene.relay import Node
+from graphene.relay import Connection, Node
 
 from ..registry import reset_global_registry
 from ..fields import SQLAlchemyConnectionField
@@ -153,7 +153,7 @@ class Meta:
         # def get_node(cls, id, info):
         #     return Article(id=1, headline='Article node')
 
-    class ArticleConnection(graphene.relay.Connection):
+    class ArticleConnection(Connection):
         class Meta:
             node = ArticleNode
 
@@ -243,7 +243,7 @@ class Meta:
             model = Editor
             interfaces = (Node, )
 
-    class EditorConnection(graphene.relay.Connection):
+    class EditorConnection(Connection):
         class Meta:
             node = EditorNode
 
@@ -394,16 +394,20 @@ class Meta:
             model = Pet
             interfaces = (Node, )
 
+    class PetConnection(Connection):
+        class Meta:
+            node = PetNode
+
     class Query(graphene.ObjectType):
-        defaultSort = SQLAlchemyConnectionField(PetNode)
-        nameSort = SQLAlchemyConnectionField(PetNode)
-        multipleSort = SQLAlchemyConnectionField(PetNode)
-        descSort = SQLAlchemyConnectionField(PetNode)
+        defaultSort = SQLAlchemyConnectionField(PetConnection)
+        nameSort = SQLAlchemyConnectionField(PetConnection)
+        multipleSort = SQLAlchemyConnectionField(PetConnection)
+        descSort = SQLAlchemyConnectionField(PetConnection)
         singleColumnSort = SQLAlchemyConnectionField(
-            PetNode, sort=graphene.Argument(sort_enum_for_model(Pet)))
+            PetConnection, sort=graphene.Argument(sort_enum_for_model(Pet)))
         noDefaultSort = SQLAlchemyConnectionField(
-            PetNode, sort=sort_argument_for_model(Pet, False))
-        noSort = SQLAlchemyConnectionField(PetNode, sort=None)
+            PetConnection, sort=sort_argument_for_model(Pet, False))
+        noSort = SQLAlchemyConnectionField(PetConnection, sort=None)
 
     query = '''
         query sortTest {