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

fixed the proble with count on GAE

Browse Source
This commit is contained in:
mdipierro
2014-03-31 00:07:31 -05:00
parent 0caae1f8d4
commit 52b55889dd
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.9.5-trunk+timestamp.2014.03.30.23.35.50 Version 2.9.5-trunk+timestamp.2014.03.31.00.06.17
gluon/dal.py
+7 -9
View File
@@ -5091,7 +5091,7 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
def filter(self, query, tableobj, prop, op, value): def filter(self, query, tableobj, prop, op, value):
return self.GAE_FILTER_OPTIONS[op](query, tableobj, prop, value) return self.GAE_FILTER_OPTIONS[op](query, tableobj, prop, value)
def select_raw(self,query,fields=None,attributes=None): def select_raw(self,query,fields=None,attributes=None,count_only=False):
db = self.db db = self.db
fields = fields or [] fields = fields or []
attributes = attributes or {} attributes = attributes or {}
@@ -5187,8 +5187,10 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
items = self.filter(items, tableobj, filter.name, filter.op, filter.value) items = self.filter(items, tableobj, filter.name, filter.op, filter.value)
else: else:
items = items.filter('%s %s' % (filter.name,filter.op), filter.value) items = items.filter('%s %s' % (filter.name,filter.op), filter.value)
if not isinstance(items,list): if count_only:
items = [len(items) if isinstance(items,list) else items.count()]
elif not isinstance(items,list):
query = items query = items
if args_get('left', None): if args_get('left', None):
raise SyntaxError('Set: no left join in appengine') raise SyntaxError('Set: no left join in appengine')
@@ -5280,12 +5282,8 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
def count(self,query,distinct=None,limit=None): def count(self,query,distinct=None,limit=None):
if distinct: if distinct:
raise RuntimeError("COUNT DISTINCT not supported") raise RuntimeError("COUNT DISTINCT not supported")
(items, tablename, fields) = self.select_raw(query) (items, tablename, fields) = self.select_raw(query,count_only=True)
# self.db['_lastsql'] = self._count(query) return items[0]
try:
return len(items)
except TypeError:
return items.count(limit=limit)
def delete(self,tablename, query): def delete(self,tablename, query):
""" """