fixed issue 989, thanks Dominic
This commit is contained in:
1 parent
9453009de6
commit
a1559c5802
2 files changed
+5
-2
No files matched your search
@@ -1 +1 @@
|
|||||||
Version 2.0.8 (2012-09-10 07:47:49) stable
|
Version 2.0.8 (2012-09-10 07:51:42) stable
|
||||||
+4
-1
@@ -8197,7 +8197,10 @@ class Expression(object):
|
|||||||
db = self.db
|
db = self.db
|
||||||
if isinstance(value,(list, tuple)):
|
if isinstance(value,(list, tuple)):
|
||||||
subqueries = [self.contains(str(v).strip()) for v in value if str(v).strip()]
|
subqueries = [self.contains(str(v).strip()) for v in value if str(v).strip()]
|
||||||
return reduce(all and AND or OR, subqueries,self.contains(''))
|
if not subqueries:
|
||||||
|
return self.contains('')
|
||||||
|
else:
|
||||||
|
return reduce(all and AND or OR,subqueries)
|
||||||
if not self.type in ('string', 'text') and not self.type.startswith('list:'):
|
if not self.type in ('string', 'text') and not self.type.startswith('list:'):
|
||||||
raise SyntaxError, "contains used with incompatible field type"
|
raise SyntaxError, "contains used with incompatible field type"
|
||||||
return Query(db, db._adapter.CONTAINS, self, value)
|
return Query(db, db._adapter.CONTAINS, self, value)
|
||||||
|
|||||||
Reference in new issue
Block a user