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

attempt to support GAE IN operator, thanks Quint

Browse Source
This commit is contained in:
mdipierro
2013-11-17 09:28:46 -06:00
parent d6e63b4d7c
commit 16b68572cd
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.7.4-stable+timestamp.2013.11.17.09.20.20 Version 2.7.4-stable+timestamp.2013.11.17.09.27.55
gluon/dal.py
+6 -2
View File
@@ -4987,6 +4987,7 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
'<=': query.filter(getattr(tableobj, prop) <= value), '<=': query.filter(getattr(tableobj, prop) <= value),
'>=': query.filter(getattr(tableobj, prop) >= value), '>=': query.filter(getattr(tableobj, prop) >= value),
'!=': query.filter(getattr(tableobj, prop) != value), '!=': query.filter(getattr(tableobj, prop) != value),
'in': query.filter(getattr(tableobj, prop).IN(value)),
}[op] }[op]
def select_raw(self,query,fields=None,attributes=None): def select_raw(self,query,fields=None,attributes=None):
@@ -5084,8 +5085,11 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
items.order(tableobj._key) items.order(tableobj._key)
else: else:
items.order('__key__') items.order('__key__')
items = self.filter(items, tableobj, filter.name, filter.op, filter.value) if self.use_ndb else\ items = self.filter(items, tableobj, filter.name,
items.filter('%s %s' % (filter.name,filter.op), filter.value) filter.op, filter.value) \
if self.use_ndb else \
items.filter('%s %s' % (filter.name,filter.op),
filter.value)
if not isinstance(items,list): if not isinstance(items,list):
if args_get('left', None): if args_get('left', None):