[SQL-CVS] r1419 - in home/phd/SQLObject/paramstyles/sqlobject: . tests

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

Author: phd
Date: 2005-12-12 16:15:10 +0000 (Mon, 12 Dec 2005)
New Revision: 1419

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py
   home/phd/SQLObject/paramstyles/sqlobject/tests/test_select.py
Log:
Merged a patch from the revisions 1418:1418 from the trunk: a patch by j.kartnaller <j.k...@ro...> to allow .selectBy() without keywords.

Modified: home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py	2005-12-12 16:11:04 UTC (rev 1418)
+++ home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py	2005-12-12 16:15:10 UTC (rev 1419)
@@ -705,6 +705,8 @@
                     data[col.dbName] = None
                 else:
                     data[col.dbName] = obj.id
+        if not data:
+            return None
         return ' AND '.join(
             ['%s %s %s' %
              (dbName, ops.get(value, "="), self.sqlrepr(value))

Modified: home/phd/SQLObject/paramstyles/sqlobject/tests/test_select.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/tests/test_select.py	2005-12-12 16:11:04 UTC (rev 1418)
+++ home/phd/SQLObject/paramstyles/sqlobject/tests/test_select.py	2005-12-12 16:15:10 UTC (rev 1419)
@@ -84,8 +84,12 @@
     b2 = IterTest(name='b')
     raises(SQLObjectIntegrityError, 'IterTest.selectBy(name="b").getOne()')
     raises(SQLObjectIntegrityError, 'IterTest.selectBy(name="b").getOne(None)')
-    
 
+def test_selectBy():
+    setupClass(IterTest)
+    a = IterTest(name='a')
+    b = IterTest(name='b')
+    assert IterTest.selectBy().count() == 2
 
 
 class Counter2(SQLObject):