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

closed github issue 5, thanks MoMaT

Browse Source
This commit is contained in:
Massimo Di Pierro
2012-05-06 16:05:13 -05:00
parent f03887f478
commit 241a5e0694
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.7 (2012-05-06 16:00:34) dev Version 1.99.7 (2012-05-06 16:05:07) dev
gluon/dal.py
+6 -5
View File
@@ -4164,10 +4164,11 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
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)
# self.db['_lastsql'] = self._select(query,fields,attributes) # self.db['_lastsql'] = self._select(query,fields,attributes)
rows = [ rows = []
[t=='id' and (int(item.key().id()) if item.key().id() else for item in items:
item.key().name()) or getattr(item, t) for t in fields] rows.append([
for item in items] t=='id' and item.key().id_or_name() or getattr(item, t) \
for t in fields])
colnames = ['%s.%s' % (tablename, t) for t in fields] colnames = ['%s.%s' % (tablename, t) for t in fields]
processor = attributes.get('processor',self.parse) processor = attributes.get('processor',self.parse)
return processor(rows,fields,colnames,False) return processor(rows,fields,colnames,False)
@@ -7178,7 +7179,7 @@ class Table(dict):
if rows: if rows:
return rows[0] return rows[0]
return None return None
elif str(key).isdigit(): elif str(key).isdigit() or isinstance(key, Key):
return self._db(self._id == key).select(limitby=(0,1)).first() return self._db(self._id == key).select(limitby=(0,1)).first()
elif key: elif key:
return dict.__getitem__(self, str(key)) return dict.__getitem__(self, str(key))