Merge branch 'hotfix/2.3.2' into develop

Author: chrisseto

share/graphql/work.py

@@ -59,7 +59,7 @@ def resolve_tags(self, limit=None, offset=None):
 
     @graphene.resolve_only_args
     def resolve_total_related_agents(self):
-        return self.agent_relations.count()
+        return self.agent_relations.exact_count()
 
     @graphene.resolve_only_args
     def resolve_related_agents(self, limit=None, offset=None):
@@ -69,7 +69,7 @@ def resolve_related_agents(self, limit=None, offset=None):
 
     @graphene.resolve_only_args
     def resolve_total_incoming_work_relations(self):
-        return self.incoming_creative_work_relations.count()
+        return self.incoming_creative_work_relations.exact_count()
 
     @graphene.resolve_only_args
     def resolve_incoming_work_relations(self, limit=None, offset=None):
@@ -79,7 +79,7 @@ def resolve_incoming_work_relations(self, limit=None, offset=None):
 
     @graphene.resolve_only_args
     def resolve_total_outgoing_work_relations(self):
-        return self.outgoing_creative_work_relations.count()
+        return self.outgoing_creative_work_relations.exact_count()
 
     @graphene.resolve_only_args
     def resolve_outgoing_work_relations(self, limit=None, offset=None):

share/models/fuzzycount.py

@@ -1,11 +1,17 @@
 from django.db import connections
 from django.db.models import QuerySet, Manager
+from django.db.models.sql.datastructures import EmptyResultSet
 
 
 class FuzzyCountQuerySet(QuerySet):
     def count(self):
         cursor = connections[self.db].cursor()
-        cursor.execute('SELECT count_estimate(%s);', (cursor.mogrify(*self.query.sql_with_params()).decode(), ))
+
+        try:
+            cursor.execute('SELECT count_estimate(%s);', (cursor.mogrify(*self.query.sql_with_params()).decode(), ))
+        except EmptyResultSet:
+            return 0
+
         return int(cursor.fetchone()[0])
 
     def exact_count(self):