diff --git a/graphene_django/__init__.py b/graphene_django/__init__.py index 648d6c9..90907ce 100644 --- a/graphene_django/__init__.py +++ b/graphene_django/__init__.py @@ -1,6 +1,6 @@ from .types import DjangoObjectType from .fields import DjangoConnectionField -__version__ = "2.2.3.4" +__version__ = "2.2.3.6" __all__ = ["__version__", "DjangoObjectType", "DjangoConnectionField"] diff --git a/graphene_django/views.py b/graphene_django/views.py index e2bc55d..6b335d8 100644 --- a/graphene_django/views.py +++ b/graphene_django/views.py @@ -85,10 +85,12 @@ class GraphQLView(View): if middleware is None: middleware = graphene_settings.MIDDLEWARE - self.schema = self.schema or schema - middleware = self.get_directive_middleware() + middleware += self.get_directive_middleware() + if middleware is not None: self.middleware = list(instantiate_middleware(middleware)) + + self.schema = self.schema or schema self.executor = executor self.root_value = root_value self.pretty = self.pretty or pretty