[SQL-CVS] r231 - in trunk/SQLObject: sqlobject tests

[<sub...@co...>]

Author: ianb
Date: 2004-09-27 14:10:58 -0400 (Mon, 27 Sep 2004)
New Revision: 231

Modified:
   trunk/SQLObject/sqlobject/main.py
   trunk/SQLObject/tests/test.py
Log:
Fixed bug [ 1034304 ] count() failes on selectBy result


Modified: trunk/SQLObject/sqlobject/main.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/SQLObject/sqlobject/main.py	2004-09-27 18:03:12 UTC (rev 230)
+++ trunk/SQLObject/sqlobject/main.py	2004-09-27 18:10:58 UTC (rev 231)
@@ -1314,7 +1314,7 @@
=20
     def count(self):
         """ Counting elements of current select results """
-        assert not self.ops['distinct'], "It is not currently supported =
to count distinct objects"
+        assert not self.ops.get('distinct'), "It is not currently suppor=
ted to count distinct objects"
            =20
         count =3D self.accumulate('COUNT(*)')
         if self.ops.get('start'):

Modified: trunk/SQLObject/tests/test.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/SQLObject/tests/test.py	2004-09-27 18:03:12 UTC (rev 230)
+++ trunk/SQLObject/tests/test.py	2004-09-27 18:10:58 UTC (rev 231)
@@ -62,6 +62,10 @@
         bob.name =3D testString
         self.failUnless(bob.name =3D=3D testString, (bob.name, testStrin=
g))
=20
+    def testCount(self):
+        self.assertEqual(self.MyClass.selectBy(name=3D'bob').count(), 1)
+        self.assertEqual(self.MyClass.select(self.MyClass.q.name =3D=3D =
'bob').count(), 1)
+        self.assertEqual(self.MyClass.select().count(), len(list(self.My=
Class.select())))
=20
 class TestCaseGetSet(TestCase1):
=20