Move check for distinct into merge_querysets; cleanup

Author: danyx23

graphene_django/fields.py

@@ -57,6 +57,10 @@ def get_manager(self):
 
     @classmethod
     def merge_querysets(cls, default_queryset, queryset):
+        if default_queryset.query.distinct and not queryset.query.distinct:
+            queryset = queryset.distinct()
+        elif queryset.query.distinct and not default_queryset.query.distinct:
+            default_queryset = default_queryset.distinct()
         return default_queryset & queryset
 
     @classmethod
@@ -90,10 +94,6 @@ 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

@@ -419,7 +419,6 @@ def resolve_films(self, args, context, info):
 
     result = schema.execute(query)
     assert not result.errors
-    print(result.data)
     assert result.data == expected