Merge branch 'master' into patch-1

Author: jnak

graphene_sqlalchemy/converter.py

@@ -178,8 +178,9 @@ def convert_scalar_list_to_list(type, column, registry=None):
     return List(String)
 
 
+@convert_sqlalchemy_type.register(types.ARRAY)
 @convert_sqlalchemy_type.register(postgresql.ARRAY)
-def convert_postgres_array_to_list(_type, column, registry=None):
+def convert_array_to_list(_type, column, registry=None):
     inner_type = convert_sqlalchemy_type(column.type.item_type, column)
     return List(inner_type)
 

graphene_sqlalchemy/enums.py

@@ -1,3 +1,4 @@
+import six
 from sqlalchemy.orm import ColumnProperty
 from sqlalchemy.types import Enum as SQLAlchemyEnumType
 
@@ -62,7 +63,7 @@ def enum_for_field(obj_type, field_name):
     if not isinstance(obj_type, type) or not issubclass(obj_type, SQLAlchemyObjectType):
         raise TypeError(
             "Expected SQLAlchemyObjectType, but got: {!r}".format(obj_type))
-    if not field_name or not isinstance(field_name, str):
+    if not field_name or not isinstance(field_name, six.string_types):
         raise TypeError(
             "Expected a field name, but got: {!r}".format(field_name))
     registry = obj_type._meta.registry

graphene_sqlalchemy/fields.py

@@ -1,6 +1,7 @@
 import warnings
 from functools import partial
 
+import six
 from promise import Promise, is_thenable
 from sqlalchemy.orm.query import Query
 
@@ -35,7 +36,7 @@ def model(self):
     def get_query(cls, model, info, sort=None, **args):
         query = get_query(model, info.context)
         if sort is not None:
-            if isinstance(sort, str):
+            if isinstance(sort, six.string_types):
                 query = query.order_by(sort.value)
             else:
                 query = query.order_by(*(col.value for col in sort))

graphene_sqlalchemy/registry.py

@@ -1,5 +1,6 @@
 from collections import defaultdict
 
+import six
 from sqlalchemy.types import Enum as SQLAlchemyEnumType
 
 from graphene import Enum
@@ -42,7 +43,7 @@ def register_orm_field(self, obj_type, field_name, orm_field):
             raise TypeError(
                 "Expected SQLAlchemyObjectType, but got: {!r}".format(obj_type)
             )
-        if not field_name or not isinstance(field_name, str):
+        if not field_name or not isinstance(field_name, six.string_types):
             raise TypeError("Expected a field name, but got: {!r}".format(field_name))
         self._registry_orm_fields[obj_type][field_name] = orm_field
 

graphene_sqlalchemy/tests/test_converter.py

@@ -323,6 +323,12 @@ def test_should_postgresql_array_convert():
     assert field.type.of_type == graphene.Int
 
 
+def test_should_array_convert():
+    field = get_field(types.ARRAY(types.Integer))
+    assert isinstance(field.type, graphene.List)
+    assert field.type.of_type == graphene.Int
+
+
 def test_should_postgresql_json_convert():
     assert get_field(postgresql.JSON()).type == graphene.JSONString