#145: Fix bug on non-count queries

ral-facilities · Sep 30, 2020 · 692ac0f · 692ac0f
1 parent 86c6f27
commit 692ac0f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/common/icat/helpers.py b/common/icat/helpers.py
@@ -164,7 +164,10 @@ def execute_query(self, client, return_json_formattable=False):
 
         # If the query has a COUNT function applied to it, some of these steps can be
         # skipped
-        count_query = True if "COUNT" in self.query.aggregate else False
+        count_query = False
+        if self.query.aggregate is not None:
+            if "COUNT" in self.query.aggregate:
+                count_query = True
 
         if self.query.aggregate == "DISTINCT" and not count_query:
             log.info("Extracting the distinct fields from query's conditions")