rebase, move to meta and address comments

Author: Julien Nakache

Diff for: graphene_sqlalchemy/converter.py

@@ -7,8 +7,6 @@
                       String)
 from graphene.types.json import JSONString
 
-from .fields import create_connection_field
-
 try:
     from sqlalchemy_utils import ChoiceType, JSONType, ScalarListType, TSVectorType
 except ImportError:
@@ -23,7 +21,7 @@ def is_column_nullable(column):
     return bool(getattr(column, "nullable", True))
 
 
-def convert_sqlalchemy_relationship(relationship, registry):
+def convert_sqlalchemy_relationship(relationship, registry, connection_field_factory):
     direction = relationship.direction
     model = relationship.mapper.entity
 
@@ -35,7 +33,7 @@ def dynamic_type():
             return Field(_type)
         elif direction in (interfaces.ONETOMANY, interfaces.MANYTOMANY):
             if _type._meta.connection:
-                return create_connection_field(relationship, registry)
+                return connection_field_factory(relationship, registry)
             return Field(List(_type))
 
     return Dynamic(dynamic_type)

Diff for: graphene_sqlalchemy/fields.py

@@ -10,7 +10,6 @@
 
 from .utils import get_query, sort_argument_for_model
 
-
 log = logging.getLogger()
 
 
@@ -99,46 +98,41 @@ def __init__(self, type, *args, **kwargs):
         super(SQLAlchemyConnectionField, self).__init__(type, *args, **kwargs)
 
 
-def default_connection_field_factory(relationship, registry):
-    model = relationship.mapper.entity
-    _type = registry.get_type_for_model(model)
-    return UnsortedSQLAlchemyConnectionField(_type._meta.connection)
-
-
-__connection_field_factory =  default_connection_field_factory
-
-def create_connection_field(relationship, registry):
-    return __connection_field_factory(relationship, registry)
+# TODO Remove in next major version
+__connectionFactory = UnsortedSQLAlchemyConnectionField
 
-def register_connection_field_factory(connection_factory):
-    global __connection_field_factory
-    __connection_field_factory = connection_factory
 
-def unregister_connection_field_factory():
-    global __connection_field_factory
-    __connection_field_factory = default_connection_field_factory
+def createConnectionField(_type):
+    log.warn(
+        'createConnectionField is deprecated and will be removed in the next '
+        'major version. Use TODO instead.'
+    )
+    return __connectionFactory(_type)
 
 
-# TODO Remove in next major version
-
 def registerConnectionFieldFactory(factoryMethod):
     log.warn(
         'registerConnectionFieldFactory is deprecated and will be removed in the next '
-        'major version. Use register_connection_field_factory instead.'
-     )
-
-    def old_factory_method_wrapper(relationship, registry):
-        model = relationship.mapper.entity
-        _type = registry.get_type_for_model(model)
-        return factoryMethod(_type)
-
-    register_connection_field_factory(old_factory_method_wrapper) 
+        'major version. Use TODO instead.'
+    )
+    global __connectionFactory
+    __connectionFactory = factoryMethod
 
 
 def unregisterConnectionFieldFactory():
     log.warn(
         'registerConnectionFieldFactory is deprecated and will be removed in the next '
-        'major version. Use unregister_connection_field_factory instead.'
-     )
-     
-    unregister_connection_field_factory()
+        'major version. Use TODO instead.'
+    )
+    global __connectionFactory
+    __connectionFactory = UnsortedSQLAlchemyConnectionField
+
+
+def default_connection_field_factory(relationship, registry):
+    log.warn(
+        'This is deprecated and will be removed in the next '
+        'major version. Use TODO instead.'
+    )
+    model = relationship.mapper.entity
+    model_type = registry.get_type_for_model(model)
+    return createConnectionField(model_type)

Diff for: graphene_sqlalchemy/tests/test_connectionfactory.py

@@ -3,10 +3,13 @@
 import six  # noqa F401
 from promise import Promise
 
-from graphene import Field, Int, Interface, ObjectType
-from graphene.relay import Connection, Node, is_node
+from graphene import (Connection, Field, Int, Interface, Node, ObjectType,
+                      is_node)
 
-from ..fields import SQLAlchemyConnectionField
+from ..fields import (SQLAlchemyConnectionField,
+                      UnsortedSQLAlchemyConnectionField,
+                      registerConnectionFieldFactory,
+                      unregisterConnectionFieldFactory)
 from ..registry import Registry
 from ..types import SQLAlchemyObjectType, SQLAlchemyObjectTypeOptions
 from .models import Article, Reporter
@@ -185,3 +188,92 @@ def resolver(*args, **kwargs):
         resolver, TestConnection, ReporterWithCustomOptions, None, None
     )
     assert result is not None
+
+
+# Tests for connection_field_factory
+
+class _TestSQLAlchemyConnectionField(SQLAlchemyConnectionField):
+    pass
+
+
+def test_default_connection_field_factory():
+    _registry = Registry()
+
+    class ReporterType(SQLAlchemyObjectType):
+        class Meta:
+            model = Reporter
+            registry = _registry
+            interfaces = (Node,)
+
+    class ArticleType(SQLAlchemyObjectType):
+        class Meta:
+            model = Article
+            registry = _registry
+            interfaces = (Node,)
+
+    assert isinstance(ReporterType._meta.fields['articles'].type(), UnsortedSQLAlchemyConnectionField)
+
+
+def test_register_connection_field_factory():
+    def test_connection_field_factory(relationship, registry):
+        model = relationship.mapper.entity
+        _type = registry.get_type_for_model(model)
+        return _TestSQLAlchemyConnectionField(_type._meta.connection)
+
+    _registry = Registry()
+
+    class ReporterType(SQLAlchemyObjectType):
+        class Meta:
+            model = Reporter
+            registry = _registry
+            interfaces = (Node,)
+            connection_field_factory = test_connection_field_factory
+
+    class ArticleType(SQLAlchemyObjectType):
+        class Meta:
+            model = Article
+            registry = _registry
+            interfaces = (Node,)
+
+    assert isinstance(ReporterType._meta.fields['articles'].type(), _TestSQLAlchemyConnectionField)
+
+
+def test_deprecated_registerConnectionFieldFactory():
+    registerConnectionFieldFactory(_TestSQLAlchemyConnectionField)
+
+    _registry = Registry()
+
+    class ReporterType(SQLAlchemyObjectType):
+        class Meta:
+            model = Reporter
+            registry = _registry
+            interfaces = (Node,)
+
+    class ArticleType(SQLAlchemyObjectType):
+        class Meta:
+            model = Article
+            registry = _registry
+            interfaces = (Node,)
+
+    assert isinstance(ReporterType._meta.fields['articles'].type(), _TestSQLAlchemyConnectionField)
+
+
+def test_deprecated_unregisterConnectionFieldFactory():
+    registerConnectionFieldFactory(_TestSQLAlchemyConnectionField)
+    unregisterConnectionFieldFactory()
+
+    _registry = Registry()
+
+    class ReporterType(SQLAlchemyObjectType):
+        class Meta:
+            model = Reporter
+            registry = _registry
+            interfaces = (Node,)
+
+    class ArticleType(SQLAlchemyObjectType):
+        class Meta:
+            model = Article
+            registry = _registry
+            interfaces = (Node,)
+
+    assert not isinstance(ReporterType._meta.fields['articles'].type(), _TestSQLAlchemyConnectionField)

Diff for: graphene_sqlalchemy/tests/test_types.py

@@ -14,11 +14,12 @@
                         convert_sqlalchemy_composite,
                         convert_sqlalchemy_hybrid_method,
                         convert_sqlalchemy_relationship)
+from .fields import default_connection_field_factory
 from .registry import Registry, get_global_registry
 from .utils import get_query, is_mapped_class, is_mapped_instance
 
 
-def construct_fields(model, registry, only_fields, exclude_fields):
+def construct_fields(model, registry, only_fields, exclude_fields, connection_field_factory):
     inspected_model = sqlalchemyinspect(model)
 
     fields = OrderedDict()
@@ -71,7 +72,7 @@ def construct_fields(model, registry, only_fields, exclude_fields):
             # We skip this field if we specify only_fields and is not
             # in there. Or when we exclude this field in exclude_fields
             continue
-        converted_relationship = convert_sqlalchemy_relationship(relationship, registry)
+        converted_relationship = convert_sqlalchemy_relationship(relationship, registry, connection_field_factory)
         name = relationship.key
         fields[name] = converted_relationship
 
@@ -99,6 +100,7 @@ def __init_subclass_with_meta__(
         use_connection=None,
         interfaces=(),
         id=None,
+        connection_field_factory=default_connection_field_factory,
         _meta=None,
         **options
     ):
@@ -115,7 +117,14 @@ def __init_subclass_with_meta__(
         ).format(cls.__name__, registry)
 
         sqla_fields = yank_fields_from_attrs(
-            construct_fields(model, registry, only_fields, exclude_fields), _as=Field
+            construct_fields(
+                model=model,
+                registry=registry,
+                only_fields=only_fields,
+                exclude_fields=exclude_fields,
+                connection_field_factory=connection_field_factory
+            ),
+            _as=Field
         )
 
         if use_connection is None and interfaces: