1
=== modified file 'storm/sqlobject.py'
2
--- storm/sqlobject.py	2009-04-24 04:05:13 +0000
3
+++ storm/sqlobject.py	2010-08-02 17:55:59 +0000
4
@@ -552,6 +552,16 @@
5
552
        return item in result_set
552
        return item in result_set
6
553
553
7
554
    def __nonzero__(self):
554
    def __nonzero__(self):
8
555
        """Return C{True} if this result set doesn't contain any results.
9
556
10
557
        @note: This method is provided for compatibility with SQL Object.  For
11
558
            new code, prefer L{is_empty}.  It's compatible with L{ResultSet}
12
559
            which doesn't have a C{__nonzero__} implementation.
13
560
        """
14
561
        return self.is_empty()
15
562
16
563
    def is_empty(self):
17
564
        """Return C{True} if this result set doesn't contain any results."""
18
555
        result_set = self._without_prejoins()._result_set
565
        result_set = self._without_prejoins()._result_set
19
556
        return not result_set.is_empty()
566
        return not result_set.is_empty()
20
557
567
21
558
568
22
=== modified file 'storm/store.py'
23
--- storm/store.py	2010-07-23 09:44:39 +0000
24
+++ storm/store.py	2010-08-02 17:55:59 +0000
25
@@ -1046,7 +1046,7 @@
26
1046
        return result.get_one() is not None
1046
        return result.get_one() is not None
27
1047
1047
28
1048
    def is_empty(self):
1048
    def is_empty(self):
30
1049
        """Return true if this L{ResultSet} contains no results."""
1049
        """Return C{True} if this result set doesn't contain any results."""
31
1050
        subselect = self._get_select()
1050
        subselect = self._get_select()
32
1051
        subselect.limit = 1
1051
        subselect.limit = 1
33
1052
        subselect.order_by = Undef
1052
        subselect.order_by = Undef
34
1053
1053
35
=== modified file 'tests/sqlobject.py'
36
--- tests/sqlobject.py	2009-04-24 03:35:36 +0000
37
+++ tests/sqlobject.py	2010-08-02 17:55:59 +0000
38
@@ -783,11 +783,27 @@
39
783
        self.assertEquals(list(result.__iter__())[0].name, "John Joe")
783
        self.assertEquals(list(result.__iter__())[0].name, "John Joe")
40
784
784
41
785
    def test_result_set__nonzero__(self):
785
    def test_result_set__nonzero__(self):
42
786
        """
43
787
        L{SQLObjectResultSet.__nonzero__} returns C{True} if the result set
44
788
        doesn't contain any results.  If it does contain results, C{False} is
45
789
        returned.
46
790
        """
47
786
        result = self.Person.select()
791
        result = self.Person.select()
48
787
        self.assertEquals(result.__nonzero__(), True)
792
        self.assertEquals(result.__nonzero__(), True)
49
788
        result = self.Person.select(self.Person.q.name == "No Person")
793
        result = self.Person.select(self.Person.q.name == "No Person")
50
789
        self.assertEquals(result.__nonzero__(), False)
794
        self.assertEquals(result.__nonzero__(), False)
51
790
795
52
796
    def test_result_set_is_empty(self):
53
797
        """
54
798
        L{SQLObjectResultSet.is_empty} returns C{True} if the result set
55
799
        doesn't contain any results.  If it does contain results, C{False} is
56
800
        returned.
57
801
        """
58
802
        result = self.Person.select()
59
803
        self.assertEquals(result.is_empty(), True)
60
804
        result = self.Person.select(self.Person.q.name == "No Person")
61
805
        self.assertEquals(result.is_empty(), False)
62
806
63
791
    def test_result_set_distinct(self):
807
    def test_result_set_distinct(self):
64
792
        result = self.Person.select("person.name = 'John Joe'",
808
        result = self.Person.select("person.name = 'John Joe'",
65
793
                                    clauseTables=["phone"])
809
                                    clauseTables=["phone"])
Reviewer	Date Requested	Status
Robert Collins (community)		Approve on 2010-08-05
Stuart Bishop (community)	2010-08-02	Approve on 2010-08-03
Storm Developers	2010-08-02	Pending
Review via email: mp+31565@code.launchpad.net