Merge branch 'master' into features/2.0

# Conflicts:
#	graphene_sqlalchemy/types.py

Author: syrusakbary

graphene_sqlalchemy/tests/models.py

@@ -2,7 +2,7 @@
 
 from sqlalchemy import Column, Date, ForeignKey, Integer, String, Table
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import relationship
+from sqlalchemy.orm import mapper, relationship
 
 Base = declarative_base()
 
@@ -47,3 +47,14 @@ class Article(Base):
     headline = Column(String(100))
     pub_date = Column(Date())
     reporter_id = Column(Integer(), ForeignKey('reporters.id'))
+
+
+class ReflectedEditor(type):
+    """Same as Editor, but using reflected table."""
+    @classmethod
+    def __subclasses__(cls):
+        return []
+
+editor_table = Table('editors', Base.metadata, autoload=True)
+
+mapper(ReflectedEditor, editor_table)

graphene_sqlalchemy/tests/test_reflected.py

@@ -0,0 +1,24 @@
+
+from graphene import ObjectType
+
+from ..registry import Registry
+from ..types import SQLAlchemyObjectType
+from .models import ReflectedEditor
+
+registry = Registry()
+
+
+class Reflected(SQLAlchemyObjectType):
+
+    class Meta:
+        model = ReflectedEditor
+        registry = registry
+
+
+def test_objecttype_registered():
+    assert issubclass(Reflected, ObjectType)
+    assert Reflected._meta.model == ReflectedEditor
+    assert list(
+        Reflected._meta.fields.keys()) == ['editor_id', 'name']
+
+

graphene_sqlalchemy/types.py

@@ -14,7 +14,7 @@
                         convert_sqlalchemy_relationship,
                         convert_sqlalchemy_hybrid_method)
 from .registry import Registry, get_global_registry
-from .utils import get_query, is_mapped
+from .utils import get_query, is_mapped_class, is_mapped_instance
 
 
 def construct_fields(model, registry, only_fields, exclude_fields):
@@ -90,7 +90,7 @@ class SQLAlchemyObjectType(ObjectType):
     def __init_subclass_with_meta__(cls, model=None, registry=None, skip_registry=False,
                                     only_fields=(), exclude_fields=(), connection=None,
                                     use_connection=None, interfaces=(), id=None, **options):
-        assert is_mapped(model), (
+        assert is_mapped_class(model), (
             'You need to pass a valid SQLAlchemy Model in '
             '{}.Meta, received "{}".'
         ).format(cls.__name__, model)
@@ -136,7 +136,7 @@ def __init_subclass_with_meta__(cls, model=None, registry=None, skip_registry=Fa
     def is_type_of(cls, root, context, info):
         if isinstance(root, cls):
             return True
-        if not is_mapped(type(root)):
+        if not is_mapped_instance(root):
             raise Exception((
                 'Received incompatible instance "{}".'
             ).format(root))

graphene_sqlalchemy/utils.py

@@ -1,4 +1,6 @@
-from sqlalchemy.ext.declarative.api import DeclarativeMeta
+from sqlalchemy.exc import ArgumentError
+from sqlalchemy.orm import class_mapper, object_mapper
+from sqlalchemy.orm.exc import UnmappedClassError, UnmappedInstanceError
 
 
 def get_session(context):
@@ -16,5 +18,19 @@ def get_query(model, context):
     return query
 
 
-def is_mapped(obj):
-    return isinstance(obj, DeclarativeMeta)
+def is_mapped_class(cls):
+    try:
+        class_mapper(cls)
+    except (ArgumentError, UnmappedClassError):
+        return False
+    else:
+        return True
+
+
+def is_mapped_instance(cls):
+    try:
+        object_mapper(cls)
+    except (ArgumentError, UnmappedInstanceError):
+        return False
+    else:
+        return True