Ensure consistent handling of graphene Enums, enum values and plain strings.

Author: zsiciarz

Diff for: graphene_sqlalchemy/fields.py

@@ -1,3 +1,4 @@
+import enum
 import warnings
 from functools import partial
 
@@ -6,11 +7,13 @@
 
 from graphene import NonNull
 from graphene.relay import Connection, ConnectionField
-from graphene.relay.connection import PageInfo, connection_adapter, page_info_adapter
-from graphql_relay.connection.arrayconnection import connection_from_array_slice
+from graphene.relay.connection import (PageInfo, connection_adapter,
+                                       page_info_adapter)
+from graphql_relay.connection.arrayconnection import \
+    connection_from_array_slice
 
 from .batching import get_batch_resolver
-from .utils import get_query
+from .utils import EnumValue, get_query
 
 
 class UnsortedSQLAlchemyConnectionField(ConnectionField):
@@ -112,10 +115,19 @@ def __init__(self, type_, *args, **kwargs):
     def get_query(cls, model, info, sort=None, **args):
         query = get_query(model, info.context)
         if sort is not None:
-            if isinstance(sort, str):
-                query = query.order_by(sort.value)
-            else:
-                query = query.order_by(*(col.value for col in sort))
+            if not isinstance(sort, list):
+                sort = [sort]
+            sort_args = []
+            # ensure consistent handling of graphene Enums, enum values and
+            # plain strings
+            for item in sort:
+                if isinstance(item, enum.Enum):
+                    sort_args.append(item.value.value)
+                elif isinstance(item, EnumValue):
+                    sort_args.append(item.value)
+                else:
+                    sort_args.append(item)
+            query = query.order_by(*sort_args)
         return query
 
 

Diff for: graphene_sqlalchemy/tests/test_benchmark.py

@@ -1,4 +1,5 @@
 import pytest
+
 import graphene
 from graphene import relay
 

Diff for: graphene_sqlalchemy/tests/test_sort_enums.py

@@ -354,7 +354,7 @@ def makeNodes(nodeList):
     """
     result = schema.execute(queryError, context_value={"session": session})
     assert result.errors is not None
-    assert '"sort" has invalid value' in result.errors[0].message
+    assert 'cannot represent non-enum value' in result.errors[0].message
 
     queryNoSort = """
         query sortTest {