Author: phd
Date: 2005-12-12 16:10:14 +0000 (Mon, 12 Dec 2005)
New Revision: 1417
Modified:
SQLObject/trunk/sqlobject/dbconnection.py
SQLObject/trunk/sqlobject/tests/test_select.py
Log:
A patch by "j.kartnaller" <j.k...@ro...> to allow .select() without keywords.
Modified: SQLObject/trunk/sqlobject/dbconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/dbconnection.py 2005-12-12 08:33:20 UTC (rev 1416)
+++ SQLObject/trunk/sqlobject/dbconnection.py 2005-12-12 16:10:14 UTC (rev 1417)
@@ -692,6 +692,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: SQLObject/trunk/sqlobject/tests/test_select.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_select.py 2005-12-12 08:33:20 UTC (rev 1416)
+++ SQLObject/trunk/sqlobject/tests/test_select.py 2005-12-12 16:10:14 UTC (rev 1417)
@@ -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):
|
