Merge 25f76833a3 into 45a9200ff6

src/infi/clickhouse_orm/query.py

@@ -296,6 +296,7 @@ class QuerySet(object):
         self._model_cls = model_cls
         self._database = database
         self._order_by = []
+        self._having = ''
         self._where_q = Q()
         self._prewhere_q = Q()
         self._grouping_fields = []
@@ -393,6 +394,9 @@ class QuerySet(object):
             if self._grouping_with_totals:
                 sql += ' WITH TOTALS'
 
+        if self._having:
+            sql += '\nHAVING ' + self.having_as_sql()
+
         if self._order_by:
             sql += '\nORDER BY ' + self.order_by_as_sql()
 
@@ -414,6 +418,12 @@ class QuerySet(object):
             for field in self._order_by
         ])
 
+    def having_as_sql(self):
+        """
+        Returns the contents of the query's `Having` clause as a string.
+        """
+        return self._having
+
     def conditions_as_sql(self, prewhere=False):
         """
         Returns the contents of the query's `WHERE` or `PREWHERE` clause as a string.
@@ -443,6 +453,26 @@ class QuerySet(object):
         qs._order_by = field_names
         return qs
 
+    def having(self, *q, **kwargs):
+        """
+        Returns a copy of this queryset that includes only rows matching the having conditions.
+        """
+
+        qs = copy(self)
+
+        condition = Q()
+        for arg in q:
+            if isinstance(arg, Q):
+                condition &= arg
+            else:
+                raise TypeError('Invalid argument "%r" to queryset filter' % arg)
+
+        if kwargs:
+            condition &= Q(**kwargs)
+
+        qs._having = condition.to_sql(self._model_cls)
+        return qs
+
     def only(self, *field_names):
         """
         Returns a copy of this queryset limited to the specified field names.