Fix creation of graphene.Enum from enum.Enum

This fixes graphql-python#152

Author: wichert

graphene_sqlalchemy/converter.py

@@ -146,12 +146,14 @@ def convert_column_to_float(type, column, registry=None):
 
 @convert_sqlalchemy_type.register(types.Enum)
 def convert_enum_to_enum(type, column, registry=None):
-    try:
-        items = type.enum_class.__members__.items()
-    except AttributeError:
+    enum_class = getattr(type, 'enum_class', None)
+    if enum_class:  # Check if an enum.Enum type is used
+        graphene_type = Enum.from_enum(enum_class)
+    else:  # Nope, just a list of string options
         items = zip(type.enums, type.enums)
+        graphene_type = Enum(type.name, items)
     return Field(
-        Enum(type.name, items),
+        graphene_type,
         description=get_column_doc(column),
         required=not (is_column_nullable(column)),
     )

graphene_sqlalchemy/tests/models.py

@@ -6,6 +6,12 @@
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import mapper, relationship
 
+
+class Hairkind(enum.Enum):
+    LONG = 'long'
+    SHORT = 'short'
+
+
 Base = declarative_base()
 
 association_table = Table(
@@ -27,6 +33,7 @@ class Pet(Base):
     id = Column(Integer(), primary_key=True)
     name = Column(String(30))
     pet_kind = Column(Enum("cat", "dog", name="pet_kind"), nullable=False)
+    hair_kind = Column(Enum(Hairkind, name="hair_kind"), nullable=False)
     reporter_id = Column(Integer(), ForeignKey("reporters.id"))
 
 

graphene_sqlalchemy/tests/test_query.py

@@ -9,7 +9,7 @@
 from ..fields import SQLAlchemyConnectionField
 from ..types import SQLAlchemyObjectType
 from ..utils import sort_argument_for_model, sort_enum_for_model
-from .models import Article, Base, Editor, Pet, Reporter
+from .models import Article, Base, Editor, Pet, Reporter, Hairkind
 
 db = create_engine("sqlite:///test_sqlalchemy.sqlite3")
 
@@ -34,7 +34,7 @@ def session():
 
 
 def setup_fixtures(session):
-    pet = Pet(name="Lassie", pet_kind="dog")
+    pet = Pet(name="Lassie", pet_kind="dog", hair_kind=Hairkind.LONG)
     session.add(pet)
     reporter = Reporter(first_name="ABA", last_name="X")
     session.add(reporter)
@@ -105,10 +105,11 @@ def resolve_pet(self, *args, **kwargs):
           pet {
             name,
             petKind
+            hairKind
           }
         }
     """
-    expected = {"pet": {"name": "Lassie", "petKind": "dog"}}
+    expected = {"pet": {"name": "Lassie", "petKind": "dog", "hairKind": "LONG"}}
     schema = graphene.Schema(query=Query)
     result = schema.execute(query)
     assert not result.errors
@@ -326,9 +327,9 @@ class Mutation(graphene.ObjectType):
 
 def sort_setup(session):
     pets = [
-        Pet(id=2, name="Lassie", pet_kind="dog"),
-        Pet(id=22, name="Alf", pet_kind="cat"),
-        Pet(id=3, name="Barf", pet_kind="dog"),
+        Pet(id=2, name="Lassie", pet_kind="dog", hair_kind=Hairkind.LONG),
+        Pet(id=22, name="Alf", pet_kind="cat", hair_kind=Hairkind.LONG),
+        Pet(id=3, name="Barf", pet_kind="dog", hair_kind=Hairkind.LONG),
     ]
     session.add_all(pets)
     session.commit()