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

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

Author: phd
Date: 2005-03-01 14:22:14 +0000 (Tue, 01 Mar 2005)
New Revision: 658

Modified:
   trunk/SQLObject/sqlobject/dbconnection.py
   trunk/SQLObject/sqlobject/tests/test_basic.py
Log:
Fixed bug https://sourceforge.net/tracker/index.php?func=detail&aid=1012150&group_id=74338&atid=540672.
Foo.selectBy(column=None) now issues '... column IS NULL'.


Modified: trunk/SQLObject/sqlobject/dbconnection.py
===================================================================
--- trunk/SQLObject/sqlobject/dbconnection.py	2005-03-01 13:04:43 UTC (rev 657)
+++ trunk/SQLObject/sqlobject/dbconnection.py	2005-03-01 14:22:14 UTC (rev 658)
@@ -478,10 +478,11 @@
                     self.sqlrepr(secondValue)))
 
     def _SO_columnClause(self, soClass, kw):
+        ops = {None: "IS"}
         return ' AND '.join(
-            ['%s = %s' %
+            ['%s %s %s' %
              (soClass.sqlmeta._columnDict[key].dbName,
-              self.sqlrepr(value))
+              ops.get(value, "="), self.sqlrepr(value))
              for key, value
              in kw.items()])
 

Modified: trunk/SQLObject/sqlobject/tests/test_basic.py
===================================================================
--- trunk/SQLObject/sqlobject/tests/test_basic.py	2005-03-01 13:04:43 UTC (rev 657)
+++ trunk/SQLObject/sqlobject/tests/test_basic.py	2005-03-01 14:22:14 UTC (rev 658)
@@ -34,6 +34,7 @@
 
 def test_count():
     setupGetters(TestSO1)
+    assert TestSO1.selectBy(name=None).count() == 0
     assert TestSO1.selectBy(name='bob').count() == 1
     assert TestSO1.select(TestSO1.q.name == 'bob').count() == 1
     assert TestSO1.select().count() == len(list(TestSO1.select()))