Fix failing unit test by handling cases where a connection is resolved involving a query with inner join and distinct that is then filtered and would be combined with a filtered queryset that is not distinct.

Author: danyx23

graphene_django/fields.py

@@ -90,6 +90,10 @@ def connection_resolver(cls, resolver, connection, default_manager, max_limit,
         if isinstance(iterable, QuerySet):
             if iterable is not default_manager:
                 default_queryset = maybe_queryset(default_manager)
+                if default_queryset.query.distinct and not iterable.query.distinct:
+                    iterable = iterable.distinct()
+                elif iterable.query.distinct and not default_queryset.query.distinct:
+                    default_queryset = default_queryset.distinct()
                 iterable = cls.merge_querysets(default_queryset, iterable)
             _len = iterable.count()
         else:

graphene_django/tests/test_query.py

@@ -411,7 +411,7 @@ def resolve_films(self, args, context, info):
         'films': {
             'edges': [{
                 'node': {
-                    'genre': 'ot'
+                    'genre': 'OT'
                 }
             }]
         }