=== modified file 'storm/sqlobject.py' --- storm/sqlobject.py 2008-06-25 06:10:10 +0000 +++ storm/sqlobject.py 2008-07-08 09:06:44 +0000 @@ -552,7 +552,9 @@ return item in result_set def __nonzero__(self): - result_set = self._without_prejoins()._result_set + copied_result = self._copy( + prejoins=None, prejoinClauseTables=None, orderBy=None) + result_set = copied_result._result_set return result_set.any() is not None def count(self): === modified file 'tests/sqlobject.py' --- tests/sqlobject.py 2008-06-25 04:49:30 +0000 +++ tests/sqlobject.py 2008-07-08 09:06:32 +0000 @@ -777,6 +777,11 @@ result = self.Person.select(self.Person.q.name == "No Person") self.assertEquals(result.__nonzero__(), False) + def test_result_set__nonzero__ignores_orderBy_and_prejoins(self): + result = self.Person.select( + prejoins=['inexistent']).orderBy('ignored') + self.assertEquals(result.__nonzero__(), True) + def test_result_set_distinct(self): result = self.Person.select("person.name = 'John Joe'", clauseTables=["phone"])