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

GAE projection - work in progress

Browse Source
This commit is contained in:
Massimo Di Pierro
2012-06-09 00:07:57 -05:00
parent 52a138ed18
commit 9a7587ea68
2 changed files with 12 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.00.0 (2012-06-08 15:20:20) dev Version 2.00.0 (2012-06-09 00:07:53) dev
gluon/dal.py
+11 -9
View File
@@ -4083,6 +4083,7 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
tableobj = self.db[tablename]._tableobj tableobj = self.db[tablename]._tableobj
items = tableobj.all() items = tableobj.all()
filters = self.expand(query) filters = self.expand(query)
projection = [field.name for field in fields]
for filter in filters: for filter in filters:
if filter.name=='__key__' and filter.op=='>' and filter.value==0: if filter.name=='__key__' and filter.op=='>' and filter.value==0:
continue continue
@@ -4090,17 +4091,19 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
if filter.value==0: if filter.value==0:
items = [] items = []
elif isinstance(filter.value, Key): elif isinstance(filter.value, Key):
item = tableobj.get(filter.value) item = tableobj.get(filter.value,projection=projection)
items = (item and [item]) or [] items = (item and [item]) or []
else: else:
item = tableobj.get_by_id(filter.value) item = tableobj.get_by_id(filter.value) ## FIX projection?
items = (item and [item]) or [] items = (item and [item]) or []
elif isinstance(items,list): # i.e. there is a single record! elif isinstance(items,list): # i.e. there is a single record!
items = [i for i in items if filter.apply(getattr(item,filter.name), items = [i for i in items if filter.apply(
filter.value)] getattr(item,filter.name),filter.value)]
else: else:
if filter.name=='__key__': items.order('__key__') if filter.name=='__key__':
items = items.filter('%s %s' % (filter.name,filter.op),filter.value) items.order('__key__')
items = items.filter('%s %s' % (filter.name,filter.op),
filter.value,projection=projection)
if not isinstance(items,list): if not isinstance(items,list):
if attributes.get('left', None): if attributes.get('left', None):
raise SyntaxError, 'Set: no left join in appengine' raise SyntaxError, 'Set: no left join in appengine'
@@ -4120,9 +4123,8 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
if attributes.get('limitby', None): if attributes.get('limitby', None):
(lmin, lmax) = attributes['limitby'] (lmin, lmax) = attributes['limitby']
(limit, offset) = (lmax - lmin, lmin) (limit, offset) = (lmax - lmin, lmin)
items = items.fetch(limit, offset=offset) items = items.fetch(limit,offset=offset,projection=projection)
fields = self.db[tablename].fields return (items, tablename, projection)
return (items, tablename, fields)
def select(self,query,fields,attributes): def select(self,query,fields,attributes):
(items, tablename, fields) = self.select_raw(query,fields,attributes) (items, tablename, fields) = self.select_raw(query,fields,attributes)