1
=== modified file 'storm/store.py'
2
--- storm/store.py	2010-02-10 11:29:39 +0000
3
+++ storm/store.py	2010-07-22 16:18:43 +0000
4
@@ -1055,6 +1055,7 @@
5
1055
        """Return true if this L{ResultSet} contains no results."""
1055
        """Return true if this L{ResultSet} contains no results."""
6
1056
        subselect = self._get_select()
1056
        subselect = self._get_select()
7
1057
        subselect.limit = 1
1057
        subselect.limit = 1
8
1058
        subselect.order_by = Undef
9
1058
        select = Select(1, tables=Alias(subselect, "_tmp"), limit=1)
1059
        select = Select(1, tables=Alias(subselect, "_tmp"), limit=1)
10
1059
        result = self._store._connection.execute(select)
1060
        result = self._store._connection.execute(select)
11
1060
        return (not result.get_one())
1061
        return (not result.get_one())
12
1061
1062
13
=== modified file 'tests/store/base.py'
14
--- tests/store/base.py	2010-06-01 08:31:53 +0000
15
+++ tests/store/base.py	2010-07-22 16:18:43 +0000
16
@@ -30,7 +30,8 @@
17
30
from storm.properties import PropertyPublisherMeta, Decimal
30
from storm.properties import PropertyPublisherMeta, Decimal
18
31
from storm.variables import PickleVariable
31
from storm.variables import PickleVariable
19
32
from storm.expr import (
32
from storm.expr import (
21
33
    Asc, Desc, Select, LeftJoin, SQL, Count, Sum, Avg, And, Or, Eq, Lower)
33
    Asc, Desc, Select, LeftJoin, SQL, Count, Sum, Avg, And, Or, Eq, Lower,
22
34
    compile)
23
34
from storm.variables import Variable, UnicodeVariable, IntVariable
35
from storm.variables import Variable, UnicodeVariable, IntVariable
24
35
from storm.info import get_obj_info, ClassAlias
36
from storm.info import get_obj_info, ClassAlias
25
36
from storm.exceptions import (
37
from storm.exceptions import (
26
@@ -513,6 +514,26 @@
27
513
        result = self.store.find(Foo, id=30)
514
        result = self.store.find(Foo, id=30)
28
514
        self.assertEquals(result.is_empty(), False)
515
        self.assertEquals(result.is_empty(), False)
29
515
516
30
517
    def test_wb_is_empty_strips_order_by(self):
31
518
        """
32
519
        L{ResultSet.is_empty} strips the C{ORDER BY} clause, if one is
33
520
        present, since it isn't required to actually determine if a result set
34
521
        has any matching rows.  This should provide some performance
35
522
        improvement when the ordered result set would be large.
36
523
        """
37
524
        statements = []
38
525
        original_execute = self.store._connection.execute
39
526
        def execute(expr):
40
527
            statements.append(compile(expr))
41
528
            return original_execute(expr)
42
529
        self.store._connection.execute = execute
43
530
44
531
        result = self.store.find(Foo, Foo.id == 300)
45
532
        result.order_by(Foo.id)
46
533
        self.assertEqual(True, result.is_empty())
47
534
        [statement] = statements
48
535
        self.assertNotIn("ORDER BY", statement)
49
536
50
516
    def test_is_empty_with_composed_key(self):
537
    def test_is_empty_with_composed_key(self):
51
517
        result = self.store.find(Link, foo_id=300, bar_id=3000)
538
        result = self.store.find(Link, foo_id=300, bar_id=3000)
52
518
        self.assertEquals(result.is_empty(), True)
539
        self.assertEquals(result.is_empty(), True)
Reviewer	Date Requested	Status
Kevin McDermott (community)	2010-07-22	Approve on 2010-07-22
Robert Collins (community)		Approve on 2010-07-22
Storm Developers	2010-07-22	Pending
Review via email: mp+30677@code.launchpad.net