Fixed assertion error while creating the ast graph raised in graphql.utils.ast_from_value

Author: CaselIT

examples/flask_sqlalchemy/schema.py

@@ -35,7 +35,7 @@ class Meta:
 class Query(graphene.ObjectType):
     node = relay.Node.Field()
     all_employees = SQLAlchemyConnectionField(
-        Employee, sort=graphene.Argument(SortEnumEmployee, default_value=EmployeeModel.id))
+        Employee, sort=graphene.Argument(SortEnumEmployee, default_value=['id', 'asc']))
     all_roles = SQLAlchemyConnectionField(Role, sort=utils.sort_argument_for_model(RoleModel))
     all_departments = SQLAlchemyConnectionField(Department)
 

graphene_sqlalchemy/fields.py

@@ -1,4 +1,3 @@
-from collections import Iterable
 from functools import partial
 
 from sqlalchemy.orm.query import Query
@@ -20,7 +19,13 @@ def model(self):
     def get_query(cls, model, info, sort=None, **args):
         query = get_query(model, info.context)
         if sort is not None:
-            query = query.order_by(*sort) if isinstance(sort, Iterable) else query.order_by(sort)
+            if isinstance(sort[0], str):
+                sort = [sort]
+            order = []
+            for column_name, direction in sort:
+                column = getattr(model, column_name)
+                order.append(getattr(column, direction)())
+            query = query.order_by(*order)
         return query
 
     @property

graphene_sqlalchemy/utils.py

@@ -47,8 +47,8 @@ def _sort_enum_for_model(cls, name=None, symbol_name=_symbol_name):
     items = []
     default = []
     for column in inspect(cls).columns.values():
-        asc = symbol_name(column.name, True), column.asc()
-        desc = symbol_name(column.name, False), column.desc()
+        asc = symbol_name(column.name, True), [column.name, 'asc']
+        desc = symbol_name(column.name, False), [column.name, 'desc']
         if column.primary_key:
             default.append(asc[1])
         items.extend((asc, desc))