Do not add group=true parameter if groups are not specified

anti-social · Jan 20, 2014 · 291a9da · 291a9da
1 parent cbf064a
commit 291a9da
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/solar/query.py b/solar/query.py
@@ -214,12 +214,12 @@ def _clone(self, cls=None):
     def clone(self):
         pass
 
-    def _add_component(self, name, **kwargs):
-        self._params[name] = True
+    def _add_component(self, name, _activate=True, **kwargs):
+        if _activate:
+            self._params[name] = True
         for p, v in kwargs.items():
             p = p.replace('_', '.')
-            if v is not None:
-                self._params['{}.{}'.format(name, p)] = v
+            self._params['{}.{}'.format(name, p)] = v
 
     def _remove_component(self, name):
         for key in list(self._params.keys()):
@@ -436,7 +436,10 @@ def group(self, *fields, **group_params):
             self._remove_component('group')
             self._groupeds = []
         else:
-            self._add_component('group', **group_params)
+            # do not activate group component
+            # Solr fails when field, query or function are not specified
+            # Grouped object activates group component when we prepare params
+            self._add_component('group', _activate=False, **group_params)
             for field in fields:
                 self = self.group_field(field)
             return self