fix field ordering in python version < 3.5

Author: Julien Nakache

graphene_sqlalchemy/tests/test_types.py

@@ -62,14 +62,18 @@ class Meta:
             interfaces = (Node,)
 
     assert list(ReporterType._meta.fields.keys()) == [
-        "column_prop",
+        # Columns
+        "column_prop",  # SQLAlchemy retuns column properties first
         "id",
         "first_name",
         "last_name",
         "email",
         "favorite_pet_kind",
+        # Composite
         "composite_prop",
+        # Hybrid
         "hybrid_prop",
+        # Relationship
         "pets",
         "articles",
         "favorite_article",
@@ -147,6 +151,7 @@ class Meta:
             use_connection = False
 
     assert list(ReporterType._meta.fields.keys()) == [
+        # First the ORMField in the order they were defined
         "first_name",
         "last_name",
         "email",
@@ -157,6 +162,7 @@ class Meta:
         "favorite_article",
         "articles",
         "pets",
+        # Then the automatic SQLAlchemy fields
         "id",
         "favorite_pet_kind",
     ]

graphene_sqlalchemy/types.py

@@ -11,6 +11,7 @@
 from graphene.relay import Connection, Node
 from graphene.types.objecttype import ObjectType, ObjectTypeOptions
 from graphene.types.utils import yank_fields_from_attrs
+from graphene.utils.orderedtype import OrderedType
 
 from .converter import (convert_sqlalchemy_column,
                         convert_sqlalchemy_composite,
@@ -23,16 +24,18 @@
 from .utils import get_query, is_mapped_class, is_mapped_instance
 
 
-class ORMField(object):
+class ORMField(OrderedType):
     def __init__(
         self,
         type=None,
         prop_name=None,
         description=None,
         deprecation_reason=None,
         required=None,
+        _creation_counter=None,
         **field_kwargs
     ):
+        super(ORMField, self).__init__(_creation_counter=_creation_counter)
         # The is only useful for documentation and auto-completion
         common_kwargs = {
            'type': type,
@@ -65,18 +68,19 @@ def construct_fields(
         auto_orm_field_names.append(prop_name)
 
     # TODO Get ORMField fields defined on parent classes
-    custom_orm_fields = OrderedDict()
+    custom_orm_fields_items = []
     for attname, value in list(obj_type.__dict__.items()):
         if isinstance(value, ORMField):
-            custom_orm_fields[attname] = value
+            custom_orm_fields_items.append((attname, value))
+    custom_orm_fields_items = sorted(custom_orm_fields_items, key=lambda item: item[1])
 
-    for orm_field_name, orm_field in custom_orm_fields.items():
+    for orm_field_name, orm_field in custom_orm_fields_items:
         prop_name = orm_field.kwargs.get('prop_name', orm_field_name)
         if prop_name not in all_model_props:
             raise Exception('Cannot map ORMField "{}" to SQLAlchemy model property'.format(orm_field_name))
         orm_field.kwargs['prop_name'] = prop_name
 
-    orm_fields = custom_orm_fields.copy()
+    orm_fields = OrderedDict(custom_orm_fields_items)
     for orm_field_name in auto_orm_field_names:
         if orm_field_name in orm_fields:
             continue
@@ -159,6 +163,7 @@ def __init_subclass_with_meta__(
                 connection_field_factory=connection_field_factory,
             ),
             _as=Field,
+            sort=False,
         )
 
         if use_connection is None and interfaces: