Merge lp:~therve/storm/217644-count-distinct into lp:storm

[Thomas Herve]

[Thomas Herve (therve)]

This is ready to review. I only handled the COUNT case, as the cases for SUM and AVG seems dubious and not really clean to handle.

[lp:~therve/storm/217644-count-distinct]

284. By Thomas Herve on 2009-01-07

Handle limit config in count.

285. By Thomas Herve on 2009-01-07

Handle offset in count, and check that it now works for sliced resultsets.

[Sidnei da Silva (sidnei)]

Looks great. +1

review: Approve

[lp:~therve/storm/217644-count-distinct]

286. By Thomas Herve on 2009-01-08

Add some tests in the sqlobject layer.

[Jamu Kakar (jkakar)]

[1]

     def count(self, expr=Undef, distinct=False):
         """Get the number of objects represented by this ResultSet."""
- return int(self._aggregate(Count(expr, distinct)))
+ if expr is Undef and (self._distinct or self._limit is not Undef or
+ self._offset is not Undef):
+ subselect = self._get_select()
+ select = Select(Count(), tables=Alias(subselect, "_tmp"))
+ result = self._store._connection.execute(select)
+ return int(result.get_one()[0])
+ else:
+ return int(self._aggregate(Count(expr, distinct)))

The behaviour when expr is Undef looks good. ResultSet._distinct is
ignored when it is provided, though. This test fails:

    def test_find_count_column_with_implicit_distinct(self):
        result = self.store.find(Link)
        result.config(distinct=True)
        count = result.count(Link.foo_id)
        self.assertEquals(count, 3)

+1 with this test included and passing.

review: Approve

[lp:~therve/storm/217644-count-distinct]

287. By Thomas Herve on 2009-01-09

Manage count with expr case, fix a parameter name in EmptyResultSet