[SQL-CVS] r1485 - SQLObject/branches/0.7-bugfix/sqlobject

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

Author: test
Date: 2006-01-10 15:18:53 -0700 (Tue, 10 Jan 2006)
New Revision: 1485

Modified:
   SQLObject/branches/0.7-bugfix/sqlobject/sresults.py
Log:
Merged r1108:1109 from trunk (fixing .filter())

Modified: SQLObject/branches/0.7-bugfix/sqlobject/sresults.py
===================================================================
--- SQLObject/branches/0.7-bugfix/sqlobject/sresults.py	2006-01-08 13:11:34 UTC (rev 1484)
+++ SQLObject/branches/0.7-bugfix/sqlobject/sresults.py	2006-01-10 22:18:53 UTC (rev 1485)
@@ -91,7 +91,13 @@
                               self.clauseTables, **self.ops)
 
     def filter(self, filter_clause):
-        return self.newClause(sqlbuilder.AND(self.clause, filter_clause))
+        if filter_clause is None:
+            # None doesn't filter anything, it's just a no-op:
+            return self
+        clause = self.clause
+        if isinstance(clause, (str, unicode)):
+            clause = sqlbuilder.SQLConstant('(%s)' % self.clause)
+        return self.newClause(sqlbuilder.AND(clause, filter_clause))
 
     def __getitem__(self, value):
         if type(value) is type(slice(1)):