dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

smarted BELONGS, thanks Jonathan

Browse Source
This commit is contained in:
mdipierro
2013-08-09 11:05:52 -05:00
parent 9c1702f5c3
commit aeb15317e0
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.6.0-development+timestamp.2013.08.09.04.48.26 Version 2.6.0-development+timestamp.2013.08.09.11.04.59
gluon/dal.py
+11 -6
View File
@@ -1263,12 +1263,17 @@ class BaseAdapter(ConnectionPool):
return '(%s OR %s)' % (self.expand(first), self.expand(second)) return '(%s OR %s)' % (self.expand(first), self.expand(second))
def BELONGS(self, first, second): def BELONGS(self, first, second):
if isinstance(second, str): if isinstance(second, str):
return '(%s IN (%s))' % (self.expand(first), second[:-1]) return '(%s IN (%s))' % (self.expand(first), second[:-1])
elif not second: if not second:
return '(1=0)' return '(1=0)'
items = ','.join(self.expand(item, first.type) for item in second) if isinstance(second, (list,tuple,frozenset)):
return '(%s IN (%s))' % (self.expand(first), items) second = set(second) # remove duplicates, make mutable
if isinstance(second, set) and None in second:
second = second.remove(None)
return self.OR(self.EQ(first, None), self.BELONGS(first, second))
items = ','.join(self.expand(item, first.type) for item in second)
return '(%s IN (%s))' % (self.expand(first), items)
def REGEXP(self, first, second): def REGEXP(self, first, second):
"regular expression operator" "regular expression operator"