Merge branch 'master' into features/2.0

# Conflicts:
#	graphene_sqlalchemy/types.py

Author: syrusakbary

docs/tutorial.rst

@@ -95,8 +95,6 @@ Create ``flask_sqlalchemy/schema.py`` and type the following:
     from graphene_sqlalchemy import SQLAlchemyObjectType, SQLAlchemyConnectionField
     from models import db_session, Department as DepartmentModel, Employee as EmployeeModel
 
-    schema = graphene.Schema()
-
 
     class Department(SQLAlchemyObjectType):
         class Meta:
@@ -114,7 +112,7 @@ Create ``flask_sqlalchemy/schema.py`` and type the following:
         node = relay.Node.Field()
         all_employees = SQLAlchemyConnectionField(Employee)
 
-    schema.query = Query
+    schema = graphene.Schema(query=Query)
 
 Creating GraphQL and GraphiQL views in Flask
 --------------------------------------------

graphene_sqlalchemy/fields.py

@@ -38,7 +38,7 @@ def connection_resolver(cls, resolver, connection, model, root, args, context, i
             _len = iterable.count()
         else:
             _len = len(iterable)
-        return connection_from_list_slice(
+        connection = connection_from_list_slice(
             iterable,
             args,
             slice_start=0,
@@ -48,6 +48,9 @@ def connection_resolver(cls, resolver, connection, model, root, args, context, i
             pageinfo_type=PageInfo,
             edge_type=connection.Edge,
         )
+        connection.iterable = iterable
+        connection.length = _len
+        return connection
 
     def get_resolver(self, parent_resolver):
         return partial(self.connection_resolver, parent_resolver, self.type, self.model)

graphene_sqlalchemy/types.py

@@ -137,4 +137,5 @@ def get_node(cls, id, context, info):
     # @annotate(info=ResolveInfo)
     def resolve_id(self):
         # graphene_type = info.parent_type.graphene_type
-        return self.__mapper__.primary_key_from_instance(self)[0]
+        keys = self.__mapper__.primary_key_from_instance(self)
+        return tuple(keys) if len(keys) > 1 else keys[0]

setup.py

@@ -33,7 +33,7 @@
 
     install_requires=[
         'six>=1.10.0',
-        'graphene>=1.0',
+        'graphene>=2.0.dev',
         'SQLAlchemy',
         'singledispatch>=3.4.0.3',
         'iso8601',