Merge branch 'master' into features/2.0

Author: syrusakbary

graphene_sqlalchemy/converter.py

@@ -10,7 +10,7 @@
 from .fields import SQLAlchemyConnectionField
 
 try:
-    from sqlalchemy_utils import ChoiceType, JSONType, ScalarListType
+    from sqlalchemy_utils import ChoiceType, JSONType, ScalarListType, TSVectorType
 except ImportError:
     class ChoiceType(object):
         pass
@@ -47,7 +47,10 @@ def dynamic_type():
             return Field(List(_type))
 
     return Dynamic(dynamic_type)
-
+    
+def convert_sqlalchemy_hybrid_method(hybrid_item):
+     return String(description=getattr(hybrid_item, '__doc__', None),
+                   required=False)
 
 def convert_sqlalchemy_composite(composite, registry):
     converter = registry.get_converter_for_composite(composite.composite_class)
@@ -96,6 +99,7 @@ def convert_sqlalchemy_type(type, column, registry=None):
 @convert_sqlalchemy_type.register(types.Enum)
 @convert_sqlalchemy_type.register(postgresql.ENUM)
 @convert_sqlalchemy_type.register(postgresql.UUID)
+@convert_sqlalchemy_type.register(TSVectorType)
 def convert_column_to_string(type, column, registry=None):
     return String(description=get_column_doc(column),
                   required=not(is_column_nullable(column)))

graphene_sqlalchemy/types.py

@@ -1,6 +1,7 @@
 from collections import OrderedDict
 
 from sqlalchemy.inspection import inspect as sqlalchemyinspect
+from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm.exc import NoResultFound
 
 from graphene import Field  # , annotate, ResolveInfo
@@ -10,7 +11,8 @@
 
 from .converter import (convert_sqlalchemy_column,
                         convert_sqlalchemy_composite,
-                        convert_sqlalchemy_relationship)
+                        convert_sqlalchemy_relationship,
+                        convert_sqlalchemy_hybrid_method)
 from .registry import Registry, get_global_registry
 from .utils import get_query, is_mapped
 
@@ -42,6 +44,24 @@ def construct_fields(model, registry, only_fields, exclude_fields):
         converted_composite = convert_sqlalchemy_composite(composite, registry)
         fields[name] = converted_composite
 
+    for hybrid_item in inspected_model.all_orm_descriptors:
+
+        if type(hybrid_item) == hybrid_property:
+            name = hybrid_item.__name__
+
+            is_not_in_only = only_fields and name not in only_fields
+            is_already_created = name in options.fields
+            is_excluded = name in exclude_fields or is_already_created
+
+            if is_not_in_only or is_excluded:
+            # We skip this field if we specify only_fields and is not
+            # in there. Or when we excldue this field in exclude_fields
+
+                continue
+            converted_hybrid_property = convert_sqlalchemy_hybrid_method(
+            hybrid_item)
+            fields[name] = converted_hybrid_property
+
     # Get all the columns for the relationships on the model
     for relationship in inspected_model.relationships:
         is_not_in_only = only_fields and relationship.key not in only_fields