Merge branch 'master' of github.com:graphql-python/graphene-sqlalchemy

Author: syrusakbary

README.md

@@ -51,7 +51,7 @@ class Query(graphene.ObjectType):
         query = User.get_query(context) # SQLAlchemy query
         return query.all()
 
-schema = graphene.Schema(query=QueryRoot)
+schema = graphene.Schema(query=Query)
 ```
 
 Then you can simply query the schema:

README.rst

@@ -58,7 +58,7 @@ following:
             query = User.get_query(context) # SQLAlchemy query
             return query.all()
 
-    schema = graphene.Schema(query=QueryRoot)
+    schema = graphene.Schema(query=Query)
 
 Then you can simply query the schema:
 

graphene_sqlalchemy/converter.py

@@ -11,14 +11,17 @@
 from .fields import SQLAlchemyConnectionField
 
 try:
-    from sqlalchemy_utils import ChoiceType, ScalarListType
+    from sqlalchemy_utils import ChoiceType, JSONType, ScalarListType
 except ImportError:
     class ChoiceType(object):
         pass
 
     class ScalarListType(object):
         pass
 
+    class JSONType(object):
+        pass
+
 
 def convert_sqlalchemy_relationship(relationship, registry):
     direction = relationship.direction
@@ -87,7 +90,8 @@ def convert_sqlalchemy_type(type, column, registry=None):
 @convert_sqlalchemy_type.register(postgresql.ENUM)
 @convert_sqlalchemy_type.register(postgresql.UUID)
 def convert_column_to_string(type, column, registry=None):
-    return String(description=column.doc, required=not(column.nullable))
+    return String(description=getattr(column, 'doc', None),
+                  required=not(getattr(column, 'nullable', True)))
 
 
 @convert_sqlalchemy_type.register(types.SmallInteger)
@@ -133,3 +137,8 @@ def convert_postgres_array_to_list(type, column, registry=None):
 @convert_sqlalchemy_type.register(postgresql.JSONB)
 def convert_json_to_string(type, column, registry=None):
     return JSONString(description=column.doc, required=not(column.nullable))
+
+
+@convert_sqlalchemy_type.register(JSONType)
+def convert_json_type_to_string(type, column, registry=None):
+    return JSONString(description=column.doc, required=not(column.nullable))

graphene_sqlalchemy/fields.py

@@ -15,11 +15,15 @@ class SQLAlchemyConnectionField(ConnectionField):
     def model(self):
         return self.type._meta.node._meta.model
 
-    @staticmethod
-    def connection_resolver(resolver, connection, model, root, args, context, info):
+    @classmethod
+    def get_query(cls, model, context, info, args):
+        return get_query(model, context)
+
+    @classmethod
+    def connection_resolver(cls, resolver, connection, model, root, args, context, info):
         iterable = resolver(root, args, context, info)
         if iterable is None:
-            iterable = get_query(model, context)
+            iterable = cls.get_query(model, context, info, args)
         if isinstance(iterable, Query):
             _len = iterable.count()
         else:

graphene_sqlalchemy/tests/test_converter.py

@@ -1,9 +1,10 @@
 from py.test import raises
-from sqlalchemy import Column, Table, types
+from sqlalchemy import Column, Table, case, types
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import composite
-from sqlalchemy_utils import ChoiceType, ScalarListType
+from sqlalchemy.sql.elements import Label
+from sqlalchemy_utils import ChoiceType, JSONType, ScalarListType
 
 import graphene
 from graphene.relay import Node
@@ -106,6 +107,12 @@ def test_should_numeric_convert_float():
     assert_column_conversion(types.Numeric(), graphene.Float)
 
 
+def test_should_label_convert_string():
+    label = Label('label_test', case([], else_="foo"), type_=types.Unicode())
+    graphene_type = convert_sqlalchemy_column(label)
+    assert isinstance(graphene_type, graphene.String)
+
+
 def test_should_choice_convert_enum():
     TYPES = [
         (u'es', u'Spanish'),
@@ -127,6 +134,10 @@ def test_should_scalar_list_convert_list():
     assert_column_conversion(ScalarListType(), graphene.List)
 
 
+def test_should_jsontype_convert_jsonstring():
+    assert_column_conversion(JSONType(), JSONString)
+
+
 def test_should_manytomany_convert_connectionorlist():
     registry = Registry()
     dynamic_field = convert_sqlalchemy_relationship(Reporter.pets.property, registry)