Move distinct check code to merge_querysets again

Author: danyx23

graphene_django/fields.py

@@ -67,6 +67,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 queryset & default_queryset
 
     @classmethod
@@ -77,10 +81,6 @@ def resolve_connection(cls, connection, default_manager, args, iterable):
         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: